Bit o refactor