Refactoring for a more command line feeling usage