
          fix S3 bucket detection and refactor

fa7157e