Google Maps

Improved name convention of properties, cleanup