Simplify markup