diff --git a/cerberus-web/src/main/java/com/nike/cerberus/config/ApplicationConfiguration.java b/cerberus-web/src/main/java/com/nike/cerberus/config/ApplicationConfiguration.java
index e96745cc..06b9d842 100644
--- a/cerberus-web/src/main/java/com/nike/cerberus/config/ApplicationConfiguration.java
+++ b/cerberus-web/src/main/java/com/nike/cerberus/config/ApplicationConfiguration.java
@@ -18,7 +18,11 @@
 
 import static com.nike.cerberus.service.EncryptionService.initializeKeyProvider;
 
-import com.amazonaws.encryptionsdk.*;
+import com.amazonaws.encryptionsdk.AwsCrypto;
+import com.amazonaws.encryptionsdk.CommitmentPolicy;
+import com.amazonaws.encryptionsdk.CryptoMaterialsManager;
+import com.amazonaws.encryptionsdk.DefaultCryptoMaterialsManager;
+import com.amazonaws.encryptionsdk.MasterKeyProvider;
 import com.amazonaws.encryptionsdk.caching.CachingCryptoMaterialsManager;
 import com.amazonaws.encryptionsdk.caching.CryptoMaterialsCache;
 import com.amazonaws.encryptionsdk.kms.KmsMasterKey;
diff --git a/cerberus-web/src/main/java/com/nike/cerberus/service/EncryptionService.java b/cerberus-web/src/main/java/com/nike/cerberus/service/EncryptionService.java
index 22ea912f..b791ce2e 100644
--- a/cerberus-web/src/main/java/com/nike/cerberus/service/EncryptionService.java
+++ b/cerberus-web/src/main/java/com/nike/cerberus/service/EncryptionService.java
@@ -16,7 +16,11 @@
 
 package com.nike.cerberus.service;
 
-import com.amazonaws.encryptionsdk.*;
+import com.amazonaws.encryptionsdk.AwsCrypto;
+import com.amazonaws.encryptionsdk.CryptoMaterialsManager;
+import com.amazonaws.encryptionsdk.DefaultCryptoMaterialsManager;
+import com.amazonaws.encryptionsdk.MasterKeyProvider;
+import com.amazonaws.encryptionsdk.ParsedCiphertext;
 import com.amazonaws.encryptionsdk.kms.KmsMasterKey;
 import com.amazonaws.encryptionsdk.kms.KmsMasterKeyProvider;
 import com.amazonaws.encryptionsdk.multi.MultipleProviderFactory;
@@ -24,7 +28,11 @@
 import com.google.common.collect.Lists;
 import com.nike.cerberus.util.CiphertextUtils;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;