Cleaned code. Started adding waypoints modal