Changes following the code review (step 2)