maintenance updates. No functionality changed.

Refactoring changes