Better cohesion