Some mark-up refinement