Cleaned up
Added a map to the route