Refactoring of command line tools
Refactoring of command line tools