Removes now unnecessary regexp and companion function. Fixes some spacing issues. Shortens field names.