Minor refactoring and permit EC2 instances to use the team's keypair.