Refactor the config a bit