Code refractoring to meet the project's overall goal