Small cleanup

* Some cleanup
* Improved StopwordsFilter