Google Drive changed to Dropbox
Minor refactoring