Code formatting & coding style updates. No functionality changed.