Code cleanup
Configuring S3 endpoint is available