Made improvements to syntax highlighting