code cleanup

* code cleanup
* config defaults are set on first load