Refactoring
Refactoring dwake