Some refactoring in Word class