refactor google integration