Fix some style nits

No functional change, just some minor style cleanups.