DRY up highlighting