Refactoring galore