addresses PR comments