started work on decoupling and increasing cohersion