Cli commands refactor

Refactored CLI commands to make it friendlier and prettier :princess: .