Updated code review comments