Cleaned up ec2control.py