Review round 1 addressing comments of @kimchy.