removing debugging code
simplifying routes
cleaning up rendering of screens