add comments per code review