Address code review feedback on 4161