Improve squashing cohesion