Better s3

Not sure what you wanted in terms of exporting functions, but this is a bit better style for s3.