issues from code review fixed