fixed s3cmd params and refactored