Doing some more data cleaning for lat/lng, and general code cleanup