Refactoring of Cohesion and Coupling