diff --git a/src/member/service.rs b/src/member/service.rs
index 9c84078..e7232b9 100644
--- a/src/member/service.rs
+++ b/src/member/service.rs
@@ -102,9 +102,9 @@ impl Service {
           None => None,
         };
 
-        let game_setting = match req.game_setting {
-          Some(a) => Some(
-            bpr::ss::member::create_member_request::request::GameSetting {
+        let game_setting =
+          req.game_setting.map(
+            |a| bpr::ss::member::create_member_request::request::GameSetting {
               can_bet_casino: a.can_bet_casino,
               can_bet_slot: a.can_bet_slot,
               can_bet_powerball: a.can_bet_powerball,
@@ -112,37 +112,32 @@ impl Service {
               can_bet_eos: a.can_bet_eos,
               can_bet_bogglepowerball: a.can_bet_bogglepowerball,
             },
-          ),
-          None => None,
-        };
+          );
 
-        let settlement_setting = match req.settlement_setting {
-          Some(a) => Some(
-            bpr::ss::member::create_member_request::request::SettlementSetting {
-              can_exchange: a.can_exchange,
-              can_first_charge_comp: a.can_first_charge_comp,
-              can_per_charge_comp: a.can_per_charge_comp,
-              manual_payment_type_for_partner: a.manual_payment_type_for_partner,
-              settlement_type: a.settlement_type,
-              rate_casino: a.rate_casino,
-              rate_casino_loosing: a.rate_casino_loosing,
-              rate_casino_bacara: a.rate_casino_bacara,
-              rate_casino_roulette: a.rate_casino_roulette,
-              rate_casino_dragon_tiger: a.rate_casino_dragon_tiger,
-              rate_slot: a.rate_slot,
-              rate_slot_loosing: a.rate_slot_loosing,
-              rate_powerball_single: a.rate_powerball_single,
-              rate_powerball_combo: a.rate_powerball_combo,
-              rate_powerladder_single: a.rate_powerladder_single,
-              rate_powerladder_combo: a.rate_powerladder_combo,
-              rate_eos_single: a.rate_eos_single,
-              rate_eos_combo: a.rate_eos_combo,
-              rate_bogglepowerball_single: a.rate_bogglepowerball_single,
-              rate_bogglepowerball_combo: a.rate_bogglepowerball_combo,
-            },
-          ),
-          None => None,
-        };
+        let settlement_setting = req.settlement_setting.map(|a| {
+          bpr::ss::member::create_member_request::request::SettlementSetting {
+            can_exchange: a.can_exchange,
+            can_first_charge_comp: a.can_first_charge_comp,
+            can_per_charge_comp: a.can_per_charge_comp,
+            manual_payment_type_for_partner: a.manual_payment_type_for_partner,
+            settlement_type: a.settlement_type,
+            rate_casino: a.rate_casino,
+            rate_casino_loosing: a.rate_casino_loosing,
+            rate_casino_bacara: a.rate_casino_bacara,
+            rate_casino_roulette: a.rate_casino_roulette,
+            rate_casino_dragon_tiger: a.rate_casino_dragon_tiger,
+            rate_slot: a.rate_slot,
+            rate_slot_loosing: a.rate_slot_loosing,
+            rate_powerball_single: a.rate_powerball_single,
+            rate_powerball_combo: a.rate_powerball_combo,
+            rate_powerladder_single: a.rate_powerladder_single,
+            rate_powerladder_combo: a.rate_powerladder_combo,
+            rate_eos_single: a.rate_eos_single,
+            rate_eos_combo: a.rate_eos_combo,
+            rate_bogglepowerball_single: a.rate_bogglepowerball_single,
+            rate_bogglepowerball_combo: a.rate_bogglepowerball_combo,
+          }
+        });
 
         let ss_create_member_req = bpr::ss::member::CreateMemberRequest {
           client: Some(client),