fixing commented issues from code review