Apply recommendations of review round 1