More refactor changes.