More refactoring....