diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index 38c6852..8b74607 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -216,11 +216,12 @@ public class JSONObject {
         }
         c = x.nextClean();
         for (;;) {
-            if (c == 0) {
+            switch (c) {
+            case 0:
                 throw x.syntaxError("A JSONObject text must end with '}'");
-            } else if (c == '}') {
+            case '}':
                 return;
-            } else {
+            default:
                 key = x.nextSimpleValue(c).toString();
             }
 
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 0e78909..96dc71c 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -397,14 +397,15 @@ public class JSONTokener {
      */
     public Object nextValue() throws JSONException {
         char c = this.nextClean();
-        if (c == '{') {
+        switch (c) {
+        case '{':
             this.back();
             try {
                 return new JSONObject(this);
             } catch (StackOverflowError e) {
                 throw new JSONException("JSON Array or Object depth too large to process.", e);
             }
-        } else if (c == '[') {
+        case '[':
             this.back();
             try {
                 return new JSONArray(this);
@@ -418,7 +419,9 @@ public class JSONTokener {
     Object nextSimpleValue(char c) {
         String string;
 
-        if (c == '"' || c == '\'') {
+        switch (c) {
+        case '"':
+        case '\'':
             return this.nextString(c);
         }