- Minor formatting fixes
- Moved some text and notes to comments