some markup cleanup