refactor field handling
refactoring