Add RestRoute
Reformat code
Refactoring