More refactor changes