- Removed word len magic numbers