Changes to address code review comments