cli: clean up code