Morning refactoring.