rename HtmlFeatureExtractor to FeatureExtractor and some other minor tweaks