More refactoring, nothing special