Working on a little refactoring