Tidy the config to avoid duplication