field refactoring
more refactoring