More refactoring fun