after the code review iteration 2