Refactoring dojo 007

Refactoring dojo 007