improve code for syntax highlighter (WIP)