More refactoring/optimization