diff --git a/src/main/java/com/bettercloud/vault/api/LogicalUtilities.java b/src/main/java/com/bettercloud/vault/api/LogicalUtilities.java
index 1fbd7126..151fb12e 100644
--- a/src/main/java/com/bettercloud/vault/api/LogicalUtilities.java
+++ b/src/main/java/com/bettercloud/vault/api/LogicalUtilities.java
@@ -1,9 +1,8 @@
 package com.bettercloud.vault.api;
 
 import com.bettercloud.vault.json.JsonObject;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import java.util.StringTokenizer;
 
 
 public class LogicalUtilities {
@@ -15,12 +14,7 @@ public class LogicalUtilities {
      * @return The path potentially mutated, based on the operation
      */
     private static List<String> getPathSegments(final String path) {
-        final List<String> segments = new ArrayList<>();
-        final StringTokenizer tokenizer = new StringTokenizer(path, "/");
-        while (tokenizer.hasMoreTokens()) {
-            segments.add(tokenizer.nextToken());
-        }
-        return segments;
+        return Arrays.asList(path.split("/"));
     }
 
     /**
@@ -64,10 +58,10 @@ public static String addQualifierToPath(final List<String> segments, final int p
      */
     public static String adjustPathForReadOrWrite(final String path, final int prefixPathLength,
             final Logical.logicalOperations operation) {
-        final List<String> pathSegments = getPathSegments(path);
         if (operation.equals(Logical.logicalOperations.readV2) || operation
                 .equals(Logical.logicalOperations.writeV2)) {
             // Version 2
+            final List<String> pathSegments = getPathSegments(path);
             final StringBuilder adjustedPath = new StringBuilder(
                     addQualifierToPath(pathSegments, prefixPathLength, "data"));
             if (path.endsWith("/")) {
@@ -93,10 +87,10 @@ public static String adjustPathForReadOrWrite(final String path, final int prefi
      */
     public static String adjustPathForList(final String path, int prefixPathDepth,
             final Logical.logicalOperations operation) {
-        final List<String> pathSegments = getPathSegments(path);
         final StringBuilder adjustedPath = new StringBuilder();
         if (operation.equals(Logical.logicalOperations.listV2)) {
             // Version 2
+            final List<String> pathSegments = getPathSegments(path);
             adjustedPath.append(addQualifierToPath(pathSegments, prefixPathDepth, "metadata"));
             if (path.endsWith("/")) {
                 adjustedPath.append("/");
@@ -122,8 +116,8 @@ public static String adjustPathForList(final String path, int prefixPathDepth,
      */
     public static String adjustPathForDelete(final String path, final int prefixPathDepth,
             final Logical.logicalOperations operation) {
-        final List<String> pathSegments = getPathSegments(path);
         if (operation.equals(Logical.logicalOperations.deleteV2)) {
+            final List<String> pathSegments = getPathSegments(path);
             final StringBuilder adjustedPath = new StringBuilder(
                     addQualifierToPath(pathSegments, prefixPathDepth, "metadata"));
             if (path.endsWith("/")) {
diff --git a/src/main/java/com/bettercloud/vault/response/LogicalResponse.java b/src/main/java/com/bettercloud/vault/response/LogicalResponse.java
index 93f3fb8d..b07e59e4 100644
--- a/src/main/java/com/bettercloud/vault/response/LogicalResponse.java
+++ b/src/main/java/com/bettercloud/vault/response/LogicalResponse.java
@@ -20,7 +20,7 @@ public class LogicalResponse extends VaultResponse {
 
     private Map<String, String> data = new HashMap<>();
     private List<String> listData = new ArrayList<>();
-    private JsonObject dataObject = null;
+    private JsonObject dataObject;
     private String leaseId;
     private Boolean renewable;
     private Long leaseDuration;
@@ -79,7 +79,6 @@ private void parseResponseData(final Logical.logicalOperations operation) {
             if (operation.equals(Logical.logicalOperations.readV2)) {
                 jsonObject = jsonObject.get("data").asObject();
             }
-            data = new HashMap<>();
             dataObject = jsonObject.get("data").asObject();
             for (final JsonObject.Member member : dataObject) {
                 final JsonValue jsonValue = member.getValue();
diff --git a/src/main/java/com/bettercloud/vault/response/PkiResponse.java b/src/main/java/com/bettercloud/vault/response/PkiResponse.java
index 6e692249..e0e6bfad 100644
--- a/src/main/java/com/bettercloud/vault/response/PkiResponse.java
+++ b/src/main/java/com/bettercloud/vault/response/PkiResponse.java
@@ -4,10 +4,9 @@
 import com.bettercloud.vault.api.pki.Credential;
 import com.bettercloud.vault.api.pki.RoleOptions;
 import com.bettercloud.vault.rest.RestResponse;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 /**
  * This class is a container for the information returned by Vault in PKI backend API
@@ -152,12 +151,7 @@ private List<String> parseCsvToList(final String input) {
         if (input == null) {
             return null;
         }
-        final List<String> returnValue = new ArrayList<>();
-        final StringTokenizer tokenizer = new StringTokenizer(input, ",");
-        while (tokenizer.hasMoreTokens()) {
-            returnValue.add(tokenizer.nextToken());
-        }
-        return returnValue;
+        return Arrays.asList(input.split(","));
     }
 
     /**