Refactoring of ColourLogic (part II)