cleaning up routes, views