General code clean-up.

Cosmetic style fixes/updates.