CLI partial refactor Helper class created