better routes, cleanup