More work to make the whole thing more elegant
Improvements to wikipedia extractor