More refactoring?