move syntax highlighting tweaks into a separate file and clean up