Code review changes

Fixes for the code review changes.