little refactor field