cleaning up some code
Merge branch 'retryon500' of https://github.com/marek-j/googledriveannex into retryon500