diff --git a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/client/DefaultMetaStoreClientFactory.java b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/client/DefaultMetaStoreClientFactory.java
index 5c2f6a5a2..4a74daca3 100644
--- a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/client/DefaultMetaStoreClientFactory.java
+++ b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/client/DefaultMetaStoreClientFactory.java
@@ -139,8 +139,8 @@ private void reconnectIfDisconnected() {
 
   }
 
-  private static class SaslMetastoreClientHander implements InvocationHandler {
-    private static final Logger LOG = LoggerFactory.getLogger(SaslMetastoreClientHander.class);
+  private static class SaslMetastoreClientHandler implements InvocationHandler {
+    private static final Logger LOG = LoggerFactory.getLogger(SaslMetastoreClientHandler.class);
 
     private final CloseableThriftHiveMetastoreIface baseHandler;
     private final ThriftMetastoreClientManager clientManager;
@@ -151,11 +151,11 @@ private static class SaslMetastoreClientHander implements InvocationHandler {
     public static CloseableThriftHiveMetastoreIface newProxyInstance(
             CloseableThriftHiveMetastoreIface baseHandler,
             ThriftMetastoreClientManager clientManager) {
-      return (CloseableThriftHiveMetastoreIface) Proxy.newProxyInstance(SaslMetastoreClientHander.class.getClassLoader(),
-              INTERFACES, new SaslMetastoreClientHander(baseHandler, clientManager));
+      return (CloseableThriftHiveMetastoreIface) Proxy.newProxyInstance(SaslMetastoreClientHandler.class.getClassLoader(),
+              INTERFACES, new SaslMetastoreClientHandler(baseHandler, clientManager));
     }
 
-    private SaslMetastoreClientHander(
+    private SaslMetastoreClientHandler(
             CloseableThriftHiveMetastoreIface handler,
             ThriftMetastoreClientManager clientManager) {
       this.baseHandler = handler;
@@ -233,8 +233,8 @@ CloseableThriftHiveMetastoreIface newInstance(
     if (base.isSaslEnabled()) {
       CloseableThriftHiveMetastoreIface ifaceReconnectingHandler = (CloseableThriftHiveMetastoreIface) Proxy
               .newProxyInstance(getClass().getClassLoader(), INTERFACES, reconnectingHandler);
-      // wrapping the SaslMetastoreClientHander to handle delegation token if using sasl
-      return SaslMetastoreClientHander.newProxyInstance(ifaceReconnectingHandler, base);
+      // wrapping the SaslMetastoreClientHandler to handle delegation token if using sasl
+      return SaslMetastoreClientHandler.newProxyInstance(ifaceReconnectingHandler, base);
     } else {
       return (CloseableThriftHiveMetastoreIface) Proxy
               .newProxyInstance(getClass().getClassLoader(), INTERFACES, reconnectingHandler);
diff --git a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/MetaStoreProxyServer.java b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/MetaStoreProxyServer.java
index b4ed5c8d5..72d48d307 100644
--- a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/MetaStoreProxyServer.java
+++ b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/MetaStoreProxyServer.java
@@ -156,7 +156,7 @@ private void startWaggleDance(
     throws Throwable {
     try {
       // Server will create new threads up to max as necessary. After an idle
-      // period, it will destory threads to keep the number of threads in the
+      // period, it will destroy threads to keep the number of threads in the
       // pool to min.
       int minWorkerThreads = hiveConf.getIntVar(ConfVars.METASTORESERVERMINTHREADS);
       int maxWorkerThreads = hiveConf.getIntVar(ConfVars.METASTORESERVERMAXTHREADS);
@@ -285,7 +285,7 @@ private void signalOtherThreadsToStart(
         try {
           Thread.sleep(1000);
         } catch (InterruptedException e) {
-          LOG.warn("Signalling thread was interuppted: " + e.getMessage());
+          LOG.warn("Signalling thread was interrupted: " + e.getMessage());
         }
       } while (!server.isServing());
       startLock.lock();
diff --git a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/security/AccessControlHandlerFactory.java b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/security/AccessControlHandlerFactory.java
index 1bebf193b..7bb0a8047 100644
--- a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/security/AccessControlHandlerFactory.java
+++ b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/security/AccessControlHandlerFactory.java
@@ -58,7 +58,7 @@ public AccessControlHandler newInstance(AbstractMetaStore metaStore) {
       }
 
     default:
-      throw new IllegalStateException("Cannot determine AcccessControlHandler type given type: '"
+      throw new IllegalStateException("Cannot determine AccessControlHandler type given type: '"
           + metaStore.getAccessControlType()
           + "'");
     }
diff --git a/waggle-dance-extensions/src/main/java/com/hotels/bdp/waggledance/extensions/client/ratelimit/redis/RedisBucketService.java b/waggle-dance-extensions/src/main/java/com/hotels/bdp/waggledance/extensions/client/ratelimit/redis/RedisBucketService.java
index 1af0ae165..9cf77bc60 100644
--- a/waggle-dance-extensions/src/main/java/com/hotels/bdp/waggledance/extensions/client/ratelimit/redis/RedisBucketService.java
+++ b/waggle-dance-extensions/src/main/java/com/hotels/bdp/waggledance/extensions/client/ratelimit/redis/RedisBucketService.java
@@ -23,7 +23,7 @@
 import com.hotels.bdp.waggledance.extensions.client.ratelimit.BucketService;
 
 /**
- * This class uses a Redis server as a the storage back-end for the rate limiter. This is useful if you have multiple
+ * This class uses a Redis server as the storage back-end for the rate limiter. This is useful if you have multiple
  * Waggle Dance instances and you want to rate limit across all of them.
  */
 public class RedisBucketService implements BucketService {