removed test
code factorisation
code factorisation