Command Line refactorisation