field class refactoring