S3 upload, code style corrections