ENH refactor and further speed up CountVectorizer