added comments from code review