cleaned up highlighting rules