refactoring + do not hardcode Google Maps API key !!!