small changes per PR comments