Sorting routes
Cleaning code