Add Google Maps support
Whitespace clean up