Add a little refactoring