Refactoring

Not changing any behaviors we agreed on. Fixing typos and reorganizing
content to remove duplication.