Clean up new CLI changes a little bit
Clean up new CLI changes a little bit

scoates/Zappa,pjz/Zappa,mathom/Zappa,parroyo/Zappa,anush0247/Zappa,michi88/Zappa,Miserlou/Zappa,anush0247/Zappa,longzhi/Zappa,longzhi/Zappa,scoates/Zappa,Miserlou/Zappa,michi88/Zappa,parroyo/Zappa,mathom/Zappa,pjz/Zappa