refactor google+ login