Minor markup changes