Just a little refactoring