Cleaned up S3 interface slightly