Tidying up the config logic a little further