Some factorisation work.