Wrap upload_to_AmazonS3 call

+ some pep8