Code cleaning only, no functional changes.