MRG Clean up CountVectorizer

The code for `CountVectorizer` was left with some redundant content. This intends to tidy things up.