More refactoring, nothing new added