More comments and markup cleanup