Great refactoring with Dick