Markup modifications for clarity