bit o refactoring