small refactoring - cleaned up CLI and additional stats command