diff --git a/.gitignore b/.gitignore
index 4ddba32bf..5e140ee22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,4 @@ junit*
 !.idea
 .idea/*
 !.idea/codeStyles
-.idea/codeStyles/*
-!.idea/codeStyles/Project.xml
+!.idea/codeStyles/**
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 87e74ec34..138c61ee8 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -9,32 +9,92 @@
       </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
+          <package name="com.fasterxml.jackson" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com.jam2in.arcus" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com.navercorp.arcus" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="java" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="javax" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="junit" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="net.sf.ehcache" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="net.spy.memcached" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="org.apache.commons" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.apache.curator" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.apache.ibatis" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.apache.logging" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="org.apache.zookeeper" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="org.aspectj" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.hamcrest" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="org.junit" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="org.jmock" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.mockito" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.mybatis" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.slf4j" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.springframework" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="com.fasterxml.jackson" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="com.jam2in.arcus" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="com.navercorp.arcus" withSubpackages="true" static="true" />
+          <emptyLine />
           <package name="java" withSubpackages="true" static="true" />
           <emptyLine />
           <package name="javax" withSubpackages="true" static="true" />
           <emptyLine />
           <package name="junit" withSubpackages="true" static="true" />
           <emptyLine />
+          <package name="net.sf.ehcache" withSubpackages="true" static="true" />
+          <emptyLine />
           <package name="net.spy.memcached" withSubpackages="true" static="true" />
           <emptyLine />
+          <package name="org.apache.commons" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="org.apache.curator" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="org.apache.ibatis" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="org.apache.logging" withSubpackages="true" static="true" />
+          <emptyLine />
           <package name="org.apache.zookeeper" withSubpackages="true" static="true" />
           <emptyLine />
+          <package name="org.aspectj" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="org.hamcrest" withSubpackages="true" static="true" />
+          <emptyLine />
           <package name="org.junit" withSubpackages="true" static="true" />
           <emptyLine />
+          <package name="org.jmock" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="org.mockito" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="org.mybatis" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="org.slf4j" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="org.springframework" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="" withSubpackages="true" static="true" />
         </value>
       </option>
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 000000000..79ee123c2
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/src/main/java/net/spy/memcached/plugin/LocalCacheManager.java b/src/main/java/net/spy/memcached/plugin/LocalCacheManager.java
index edfb30ea5..309217ebe 100644
--- a/src/main/java/net/spy/memcached/plugin/LocalCacheManager.java
+++ b/src/main/java/net/spy/memcached/plugin/LocalCacheManager.java
@@ -24,9 +24,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import net.spy.memcached.compat.log.Logger;
-import net.spy.memcached.compat.log.LoggerFactory;
-
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
@@ -34,6 +31,9 @@
 import net.sf.ehcache.config.PersistenceConfiguration;
 import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
 
+import net.spy.memcached.compat.log.Logger;
+import net.spy.memcached.compat.log.LoggerFactory;
+
 /**
  * Local cache storage based on ehcache.
  */
diff --git a/src/main/java/net/spy/memcached/protocol/ascii/StoreOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/StoreOperationImpl.java
index 3d40fb900..a21aa3c14 100644
--- a/src/main/java/net/spy/memcached/protocol/ascii/StoreOperationImpl.java
+++ b/src/main/java/net/spy/memcached/protocol/ascii/StoreOperationImpl.java
@@ -19,7 +19,6 @@
 
 package net.spy.memcached.protocol.ascii;
 
-
 import net.spy.memcached.ops.APIType;
 import net.spy.memcached.ops.OperationCallback;
 import net.spy.memcached.ops.StoreOperation;
diff --git a/src/main/java/net/spy/memcached/util/BTreeUtil.java b/src/main/java/net/spy/memcached/util/BTreeUtil.java
index 081ea9d9b..177b19250 100644
--- a/src/main/java/net/spy/memcached/util/BTreeUtil.java
+++ b/src/main/java/net/spy/memcached/util/BTreeUtil.java
@@ -17,7 +17,6 @@
  */
 package net.spy.memcached.util;
 
-
 import net.spy.memcached.CachedData;
 import net.spy.memcached.collection.BKeyObject;
 import net.spy.memcached.collection.Element;
diff --git a/src/test/java/net/spy/memcached/ProtocolBaseCase.java b/src/test/java/net/spy/memcached/ProtocolBaseCase.java
index 894f9bee1..b4bb832ec 100644
--- a/src/test/java/net/spy/memcached/ProtocolBaseCase.java
+++ b/src/test/java/net/spy/memcached/ProtocolBaseCase.java
@@ -37,7 +37,6 @@
 import net.spy.memcached.transcoders.SerializingTranscoder;
 import net.spy.memcached.transcoders.Transcoder;
 
-
 public abstract class ProtocolBaseCase extends ClientBaseCase {
 
   public void testAssertions() {
diff --git a/src/test/java/net/spy/memcached/RedistributeFailureModeTest.java b/src/test/java/net/spy/memcached/RedistributeFailureModeTest.java
index f87ca6f0f..c1b1e55ac 100644
--- a/src/test/java/net/spy/memcached/RedistributeFailureModeTest.java
+++ b/src/test/java/net/spy/memcached/RedistributeFailureModeTest.java
@@ -7,7 +7,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-
 public class RedistributeFailureModeTest extends ClientBaseCase {
 
   private String serverList;
diff --git a/src/test/java/net/spy/memcached/TimeoutTest.java b/src/test/java/net/spy/memcached/TimeoutTest.java
index 2c3132620..34e57d67e 100644
--- a/src/test/java/net/spy/memcached/TimeoutTest.java
+++ b/src/test/java/net/spy/memcached/TimeoutTest.java
@@ -1,9 +1,9 @@
 package net.spy.memcached;
 
-import junit.framework.TestCase;
-
 import java.util.Arrays;
 
+import junit.framework.TestCase;
+
 public class TimeoutTest extends TestCase {
   private MemcachedClient client = null;
 
diff --git a/src/test/manual/net/spy/memcached/test/MultiNodeFailureTest.java b/src/test/manual/net/spy/memcached/test/MultiNodeFailureTest.java
index ee5ab9472..1ac3c67ad 100644
--- a/src/test/manual/net/spy/memcached/test/MultiNodeFailureTest.java
+++ b/src/test/manual/net/spy/memcached/test/MultiNodeFailureTest.java
@@ -1,10 +1,10 @@
 package net.spy.memcached.test;
 
+import java.util.Arrays;
+
 import net.spy.memcached.AddrUtil;
 import net.spy.memcached.MemcachedClient;
 
-import java.util.Arrays;
-
 /**
  * This is an attempt to reproduce a problem where a server fails during a
  * series of gets.