diff --git a/config/partner_gms.mk b/config/partner_gms.mk
index fd920c7c..8c705b45 100644
--- a/config/partner_gms.mk
+++ b/config/partner_gms.mk
@@ -1,23 +1,15 @@
 ifeq ($(WITH_GMS),true)
 ifeq ($(PRODUCT_IS_ATV),true)
 $(call inherit-product-if-exists, vendor/partner_gms-tv/products/gms.mk)
-else
-ifeq ($(WITH_GMS_FI),true)
+else ifeq ($(WITH_GMS_FI),true)
 $(call inherit-product-if-exists, vendor/partner_gms/products/fi.mk)
-else
-ifeq ($(WITH_GMS_GO),true)
+else ifeq ($(WITH_GMS_GO),true)
 $(call inherit-product-if-exists, vendor/partner_gms/products/gms_go.mk)
-else
-ifeq ($(WITH_GMS_GO_2GB),true)
+else ifeq ($(WITH_GMS_GO_2GB),true)
 $(call inherit-product-if-exists, vendor/partner_gms/products/gms_go_2gb.mk)
-else
-ifeq ($(WITH_GMS_MINIMAL),true)
+else ifeq ($(WITH_GMS_MINIMAL),true)
 $(call inherit-product-if-exists, vendor/partner_gms/products/gms_minimal.mk)
 else
 $(call inherit-product-if-exists, vendor/partner_gms/products/gms.mk)
 endif
 endif
-endif
-endif
-endif
-endif