Refactoring. No functionality changes.