refactor pt 1
update cli