Refactoring. Increased pointer size.