change cli interface
refactor cli