refactoring galore