code review comments addressed