A bit of refactoring
Added long word wrapper