cleaning up the ec2 recipes a bit