Refactoring/Update of code to reflect changes in Googles API service