style fixes.

Small fixes, mostly a matter of taste.