more fun with refactoring.