more google map refactoring