Simplify the markup