Command line refactored