Regrouped config options and removed newlines.