coupling/high cohesion fix