fixing per PR comments