2343 - code review comments from bturner