Tightening after pull request feedback