link highlights and class cleanup