Make conditional simpler