refactor field