Refactoring to make it easier to test different matching strategies.  Initial code added to remove stop words.