Code cleanup and enhancements of Words Extractor