Simplify default storage_options

For #16