Tidy up Amazon S3 example