ENG-4463 addressed Paul, and John P. code review comments