- Improved Style
- Correct some context values