Refactoring of ColourLogic (part III)