Some tightening up