and a little refactoring

little