Syntax highlighting
Cosmetics
Refactoring