Clean up to ensure low coupling - information expert and high cohesion