acu150736 code review feedback and bug fix