Change Automation

Optimization & Cleanup