Change Automation Reference

Optimization & Cleanup