acu149679 more code review feedback