Happy little refactor