refactoring (again) of wordnet stuff