Logical markup.

Lots of nits in both.
4 files changed