Apply changes of review

The changes commented in the code review are already applied.