Clean up and work on routes