cli simplified, refactoring