Fix to Google Maps - All buildings.
Some code clean up