Tightening pass on Pip