tidying up fields refactor