Apply review feedback. Part 1