Clean routes
Add validates
Refactoring