clean up CLI slightly