acu127362 - code review feedback round 2