Minor work to separate config from code