Cleaned up markup and cross refs
Merge pull request #295 from w3c/cleanup

Cleaned up markup and cross refs