Code clean up. No functionality changes.