Improved prettify
Improved rendering in switch-cases