Minor edits to NBClassifier