Code cleanup
Use sample config file as basis when creating new config