Clean up the config settings to make more sense