Fix lint warnings, style fixups

Followup work for recent PRs
Merge pull request #2566 from zpao/style-fixup

Fix lint warnings, style fixups