refactored home route generation

and other minor refactorings