improve code quality of create_disk and availability_zone_selector