Clean up routes and remove unnecessary comments and duplication
Remove hanging spaces at end of lines and clean up formating