More refactoring 2