Google sign in refactoring …