happy little refactor