Code cleanup
- Syntax highlighting really helps