changed from cloudmade to mapbox tiles, cleaned code to hang closer to domain model