- Typos
- General code cleanup