Added saving to the config
Cleanup