EDA Integrated Project Ok, Now Refactor