little refactoring
little refactoring