acu144426 - Respond to code review comments