Minor refactoring of the config file.