Improves the two rules that condenses margin and padding to handle whitespace better and merges them into one rule.