Respond to second round of PR comments