Refactoring GoogleDrive service