Code style cleanup, no logic changes.