A little refactoring and such