cleanups

Updating to latest standards and conventions - no behavior changes.

@jcredding ready for review.