Syntax highlighting refactored