mostly markup cleanup