added code review comments