More CAN tidying