Switch (hue) away from clunky code