Reindenting, cleaning up routes
delete test stuff
Tentative refactorings for searches