Remove stop words and general refactoring