refactor google service