Added code review comments

Added code review comments