Refactor parsing the fields.