Cleanup and moved hue options into kwargs for subclass