Refactoring
More refactoring.