Applying pull request feedback.

Miscellaneous changes to match project coding practices.