Responded to PR comments