minor code changes, because the Cli class got a C from code climate (a B would be nice)