More refactor updates.