fixes of code review
fixes of code review