Refactoring DOJO #2