Remove debug output, extract all the field names into constants for easier updating