Code review

Cleanup and tweaks from team code review.

@bengrunfeld-wf @amandeepgill-wf