A little refactoring
A little refactoring