Code cleanup PHASE 2