Google signin refactoring #1