More fun with refactoring