wordforms refactor