Slight improvements to markup