Fixed EBS costs computation
Refactored S3 specific processing to fit the class coding convention