Little cleanup to CLI