some cleanup
simpler highlighting rules
cleanup