Simplify logic in config