fixed code review thangs