Cleaned up Automation Scripts