Fixed syntax highlighting and formatting