Minor cleanup in nlp