added the code review comments