continued working on cohesion and cleaning up the code