diff --git a/npc/merchants/grandpa_pharmacist.txt b/npc/merchants/grandpa_pharmacist.txt
index bf80d131f2..67ff9e02ac 100644
--- a/npc/merchants/grandpa_pharmacist.txt
+++ b/npc/merchants/grandpa_pharmacist.txt
@@ -102,7 +102,7 @@ sF_Make:
 	set @herbnum, 2;
 	if(getarg(1) != 0) set @herbnum, 1;
 	if(countitem(getarg(0)) < @herbnum) goto L_NdHerbs;
-	if((getarg(1) != 0) && (countitem(getarg(1)) < @herbnum)) goto L_NdHerbs;
+	if(getarg(1) != 0) if(countitem(getarg(1)) < @herbnum) goto L_NdHerbs;
 	if(countitem(713) < 1) goto L_NdBottle;
 	if(Zeny < getarg(2)) goto L_NdZeny;
 
@@ -115,7 +115,7 @@ sF_Make:
 		set @amount, 1000;
 		if(zeny/getarg(2) < @amount) set @amount, zeny/getarg(2);
 		if(countitem(getarg(0))/@herbnum < @amount) set @amount, countitem(getarg(0))/@herbnum;
-		if((countitem(getarg(1))/@herbnum < @amount) && (countitem(getarg(1)) != 0)) set @amount, countitem(getarg(1))/@herbnum;
+		if(getarg(1) != 0) if (countitem(getarg(1))/@herbnum < @amount) set @amount, countitem(getarg(1))/@herbnum;
 		if(countitem(713) < @amount) set @amount, countitem(713);
 		if(@amount > 0) goto L_End;
 		mes "[Grampa Pharmacist]";
@@ -126,7 +126,7 @@ sF_Make:
 		input @amount;
 		if(@amount<1 || @amount>1000) goto L_BadAmnt;
 		if(countitem(getarg(0))/@herbnum < @amount) goto L_NdHerbs;
-		if((countitem(getarg(1))/@herbnum < @amount) && (countitem(getarg(1)) != 0)) goto L_NdHerbs;
+		if(getarg(1) != 0) if (countitem(getarg(1))/@herbnum < @amount) goto L_NdHerbs;
 		if(countitem(713) < @amount) goto L_NdBottle;
 		if(Zeny < (getarg(2)*@amount)) goto L_NdZeny;