Improved markup