made syntax highlight conditional, cleanup