Added code review remarks