Converted from EC2 CLI to AWS CLI, cleaned up comments