Minor:

- cleanup and convert
Should I have config[storage] ?