Improving the markup