Fix grammar and markup

Remove/fix non-semantic markup, clean up grammar.