Yaruson CLI refactoring