A bit better markup