More refactoring clean up.