Refactoring, CLI improvement.