Another small tidy up to rgb()