Improve design cohesion.