Remove code duplicity
Small command line refactorisation