I like this refactoring.