Minor:

- cleanup and convert
config[i]?