More refactoring fun.