Added code review comments