Added comments from code review