small refactor of Word