Clean up the config parser a bit