Minor refactoring.
Corpus building tools initialized.