cleaning up some of the config file control flow