cli
cli
cli & code refactor