HueHandler - tidy up code