cleaned up routes, helpers