Concise code for selecting infrastructure
Merge remote-tracking branch 'drnic/concise_infra_choice'