Cleaning Code Phase 2