minor cleanup to CLI