More refactoring completed