Tidied up colour matrix processing