Refactored code pages