More refactoring magic