Simpler refactoring.