More refactoring..