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