Refactor syntax coloring