Tweak according to PR comments