Some refactor in google_maps