a little refactoring
a little refactoring