refactor asw s3 storage service