Major code cleanup in PcDesign class
Stable version before 2nd sprint