Cleanups from code review

Cleanups from code review