diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
index 7981fd26b52..c0f855b1429 100644
--- a/.baseline/checkstyle/checkstyle-suppressions.xml
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0"?>
-
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <!-- IMPORTANT ECLIPSE NOTE: If you change this file, you must restart Eclipse
  for your changes to take effect in its Checkstyle integration. -->
 <suppressions>
     <!-- Suppress test classes -->
-    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="AvoidStaticImport" />
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="Javadoc*" />
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VariableDeclarationUsageDistance" />
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VisibilityModifier" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="AvoidStaticImport" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemOut" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemErr" />
+
+    <!-- Suppress test resources -->
+    <suppress files="[/\\]src[/\\]test[/\\]resources.*" checks="." />
 
     <!-- JavadocStyle enforces existence of package-info.java package-level Javadoc; we consider this a bug. -->
     <suppress files="package-info.java" checks="JavadocStyle" />
@@ -21,17 +25,5 @@
     <suppress files="\.(bdr|eot|gif|gzip|jar|json|otf|png|svg|ttf|woff|zip)$" checks="NewlineAtEndOfFile" />
 
     <!-- Generated code should not be subjected to checkstyle. -->
-    <suppress files="[/\\].*[/\\]generated_src[/\\]" checks="." />
-    <suppress files="[/\\].*[/\\]generated_testSrc[/\\]" checks="." />
-    <suppress files="[/\\].*[/\\]generated[/\\]" checks="." />
-
-    <!-- Certain AtlasDB projects are ignored. -->
-    <suppress files="atlasdb-client/*" checks="." />
-    <suppress files="atlasdb-commons/*" checks="." />
-    <suppress files="atlasdb-console/*" checks="." />
-    <suppress files="atlasdb-jdbc/*" checks="." />
-    <suppress files="atlasdb-jdbc-tests/*" checks="." />
-    <suppress files="cassandra-partitioner/*" checks="." />
-    <suppress files="commons-db/*" checks="." />
-    <suppress files="lock-impl/*" checks="." />
+    <suppress files="[/\\].*[/\\]generated.*[/\\]" checks="." />
 </suppressions>
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 0775cbba707..cd19cae4588 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     Palantir Baseline Checkstyle configuration.
@@ -39,17 +39,30 @@
         <property name="format" value="\s+$"/>
         <property name="message" value="Whitespace at end-of-line"/>
     </module>
+    <module name="RegexpMultiline"> <!-- Java Style Guide: Vertical Whitespace -->
+        <property name="fileExtensions" value="java"/>
+        <property name="format" value="^\n\n$"/>
+        <property name="message" value="Two consecutive blank lines are not permitted."/>
+    </module>
     <module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
         <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
     </module>
+    <module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
+        <!-- custom-suppressions.xml allows users to specify suppresions that will not be overriden by baselineUpdateConfig -->
+        <property name="file" value="${config_loc}/custom-suppressions.xml"/>
+        <property name="optional" value="true"/>
+    </module>
     <module name="SuppressWarningsFilter"/> <!-- baseline-gradle: README.md -->
-    <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
-        <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
-        <property name="checkFormat" value="$1"/>
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
     </module>
     <module name="TreeWalker">
+        <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+            <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+            <property name="checkFormat" value="$1"/>
+        </module>
         <module name="AbbreviationAsWordInName"> <!-- Java Style Guide: Camel case : defined -->
             <property name="ignoreFinal" value="false"/>
             <property name="allowedAbbreviationLength" value="1"/>
@@ -73,7 +86,14 @@
         </module>
         <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
         <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
-            <property name="excludes" value="org.junit.Assert.*,org.junit.Assume.*,org.hamcrest.Matchers.*,org.mockito.ArgumentMatchers.*,org.mockito.Mockito.*,org.mockito.Matchers.*,org.mockito.internal.verification.VerificationModeFactory.*,org.assertj.core.api.Assertions.*,org.assertj.core.api.AssertionsForClassTypes.*,com.google.common.base.Preconditions.*,org.apache.commons.lang3.Validate.*,com.google.common.truth.Truth.*,com.github.tomakehurst.wiremock.client.WireMock.*"/>
+            <property name="excludes" value="
+                com.google.common.base.Preconditions.*,
+                com.palantir.logsafe.Preconditions.*,
+                java.util.Collections.*,
+                java.util.stream.Collectors.*,
+                org.apache.commons.lang3.Validate.*,
+                org.assertj.core.api.Assertions.*,
+                org.mockito.Mockito.*"/>
         </module>
         <module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
@@ -95,8 +115,6 @@
         <module name="EmptyStatement"/> <!-- Java Style Guide: One statement per line -->
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/> <!-- Java Style Guide: Fall-through: commented -->
-        <module name="FileContentsHolder"/> <!-- Required for SuppressionCommentFilter -->
-        <module name="FinalClass"/> <!-- Java Coding Guidelines: Private constructors -->
         <module name="GenericWhitespace"> <!-- Java Style Guide: Horizontal whitespace -->
             <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
             <message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
@@ -113,10 +131,30 @@
             <property name="illegalPkgs" value="junit.framework"/>
             <message key="import.illegal" value="Use JUnit 4-style (org.junit.*) test classes and assertions instead of JUnit 3 (junit.framework.*)."/>
         </module>
+        <module name="IllegalImport"> <!-- Only relevant for pre-Java 11 because javafx is gone completely in Java 11 -->
+            <property name="id" value="BanJavafx"/>
+            <property name="illegalPkgs" value="javafx"/>
+            <message key="import.illegal" value="Must not import javafx classes because some OpenJDK builds do not include javafx."/>
+        </module>
+        <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
+            <property name="illegalPkgs" value="org.elasticsearch.common.base, com.clearspring.analytics.util, org.spark_project.guava"/>
+            <message key="import.illegal" value="Must not import repackaged classes."/>
+        </module>
         <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
-            <property name="illegalPkgs" value="sun, org.elasticsearch.common.base, jersey.repackaged.com.google.common, com.google.api.client.repackaged, org.apache.hadoop.thirdparty.guava, com.clearspring.analytics.util, org.spark_project.guava"/>
+            <property name="id" value="BanShadedClasses"/>
+            <property name="illegalPkgs" value=".*\.(repackaged|shaded|thirdparty)"/>
+            <property name="regexp" value="true" />
             <message key="import.illegal" value="Must not import repackaged classes."/>
         </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="^org\.gradle\.(internal|.*\.internal)"/>
+            <property name="regexp" value="true" />
+            <message key="import.illegal" value="Do not rely on gradle internal classes as these may change in minor releases - use org.gradle.api versions instead."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="sun"/>
+            <message key="import.illegal" value="Must not use Oracle's Java implementation details. See http://www.oracle.com/technetwork/java/faq-sun-packages-142232.html ."/>
+        </module>
         <module name="IllegalImport">
             <property name="illegalPkgs" value="org.apache.commons.lang"/>
             <message key="import.illegal" value="lang is deprecated, use lang3 instead."/>
@@ -126,9 +164,14 @@
             <message key="import.illegal" value="math is deprecated, use math3 instead."/>
         </module>
         <module name="IllegalImport">
+            <property name="id" value="BanLoggingImplementations"/>
             <property name="illegalPkgs" value="org.apache.log4j, org.apache.logging.log4j, java.util.logging, ch.qos.logback"/>
             <message key="import.illegal" value="Use SLF4J instead of a logging framework directly."/>
         </module>
+        <module name="IllegalImport">
+            <property name="illegalClasses" value="com.google.common.base.Optional, com.google.common.base.Supplier"/>
+            <message key="import.illegal" value="Use the Java8 version of Guava objects."/>
+        </module>
         <module name="IllegalInstantiation"> <!-- Java Coding Guidelines: Never instantiate primitive types -->
             <property name="classes" value="java.lang.Boolean"/>
             <property name="classes" value="java.lang.Byte"/>
@@ -145,32 +188,35 @@
             <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
         </module>
         <module name="IllegalType"> <!-- Java Coding Guide: Limit coupling on concrete classes -->
-            <property name="illegalClassNames" value="java.util.HashSet, java.util.HashMap, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
+            <property name="illegalClassNames" value="java.util.ArrayList, java.util.HashSet, java.util.HashMap, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
+        </module>
+        <module name="IllegalType">
+            <property name="id" value="BanGuavaCaches"/>
+            <property name="illegalClassNames" value="com.google.common.cache.CacheBuilder, com.google.common.cache.Cache, com.google.common.cache.LoadingCache"/>
+            <message key="illegal.type" value="Do not use Guava caches, they are outperformed by and harder to use than Caffeine caches"/>
         </module>
         <module name="ImportOrder"> <!-- Java Style Guide: Ordering and spacing -->
-            <!-- <property name="groups" value="/.*/"/> -->
-            <property name="groups" value="java,javax,org,com"/>
+            <property name="groups" value="/.*/"/>
             <property name="option" value="top"/>
-            <property name="sortStaticImportsAlphabetically" value="false"/>
+            <property name="separated" value="true"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
         </module>
         <module name="Indentation"> <!-- Java Style Guide: Block indentation: +4 spaces -->
             <property name="arrayInitIndent" value="8"/>
             <property name="lineWrappingIndentation" value="8"/>
         </module>
         <module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used -->
-        <module name="LeftCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
-            <property name="maxLineLength" value="120"/>
-        </module>
+        <module name="LeftCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style -->
         <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
             <property name="max" value="120"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
         <module name="MemberName"> <!-- Java Style Guide: Non-constant field names -->
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="MethodName"> <!-- Java Style Guide: Method names -->
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9_]+$"/>
             <message key="name.invalidPattern" value="Method name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="MethodParamPad"/> <!-- Java Style Guide: Horizontal whitespace -->
@@ -248,6 +294,11 @@
             <property name="format" value="CoreMatchers\.equalTo"/>
             <property name="message" value="Use Assert.assertEquals()."/>
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanJacksonFindAndRegisterModulesMethod"/>
+            <property name="format" value="findAndRegisterModules"/>
+            <property name="message" value="Use ObjectMapper#registerModule(&lt;yourModule&gt;) explicitly. ObjectMapper#findAndRegisterModules() is dangerous because it will change behaviour depending on which modules are on your classpath (including transitive dependencies)."/>
+        </module>
         <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
             <property name="format" value="CoreMatchers\.notNull"/>
             <property name="message" value="Use better assertion method(s): Assert.assertEquals(), assertNull(), assertSame(), etc."/>
@@ -288,11 +339,6 @@
             <property name="format" value="\? extends Object\W"/>
             <property name="message" value="Use ? rather than ? extends Object."/>
         </module>
-        <module name="RegexpSinglelineJava">
-            <property name="format" value="\bPreconditions\.check.*\{\}"/>
-            <property name="message" value="Use printf-style formatting in Preconditions, not '{}' style formatting."/>
-            <property name="ignoreComments" value="true"/>
-        </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="(?i)log(ger)?\.(debug|info|warn|error)\(.*%[sd]"/>
             <property name="message" value="SLF4J loggers support '{}' style formatting."/>
@@ -304,7 +350,18 @@
             <property name="ignoreComments" value="true"/>
         </module>
         <module name="RegexpSinglelineJava">
-            <property name="id" value="jdkStandardCharsets"/>
+            <property name="id" value="BanSystemOut"/>
+            <property name="format" value="System\.out\."/>
+            <property name="message" value="Logging with System.out is not allowed because it has no metadata and can't be configured at runtime. Please use an SLF4J logger instead, e.g. log.info(&quot;Message&quot;)."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanSystemErr"/>
+            <property name="format" value="System\.err\."/>
+            <property name="message" value="Logging with System.err is not allowed because it has no metadata and can't be configured at runtime. Please use an SLF4J logger instead, e.g. log.info(&quot;Message&quot;)."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="RegexpSinglelineJava">
             <property name="format" value="\bCharsets\."/>
             <property name="message" value="Use JDK StandardCharsets instead of alternatives."/>
         </module>
@@ -317,20 +374,16 @@
             <property name="message" value="Prefer Guava''s [CharStreams,Files,Resources].toString to avoid charset/stream closing issues."/>
         </module>
         <module name="RegexpSinglelineJava">
-            <property name="format" value="static enum"/>
-            <property name="message" value="Redundant ''static'' modifier."/>
+            <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
+            <property name="message" value="TODO format: // TODO(#issue): explanation"/>
         </module>
         <module name="RegexpSinglelineJava">
-            <property name="format" value="(\/\/TODO)|(\/\/ TODO:)|(\/\/ TODO\(\))|(\/\/ TODO\(.*\):[^ ])|(\/\/ TODO\(.*\)[^:])"/>
-            <property name="message" value="TODO format: // TODO(flastname): explanation"/>
-        </module>
-        <!-- <module name="RegexpSinglelineJava">
             <property name="format" value="(void setUp\(\))|(void setup\(\))|(void setupStatic\(\))|(void setUpStatic\(\))|(void beforeTest\(\))|(void teardown\(\))|(void tearDown\(\))|(void beforeStatic\(\))|(void afterStatic\(\))"/>
             <property name="message" value="Test setup/teardown methods are called before(), beforeClass(), after(), afterClass(), but not setUp, teardown, etc."/>
-        </module> -->
+        </module>
         <module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
             <property name="option" value="same"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
         </module>
         <module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
             <property name="option" value="alone"/>
@@ -362,14 +415,14 @@
             <property name="processJavadoc" value="true"/>
         </module>
         <module name="UpperEll"/> <!-- Java Style Guide: Numeric Literals -->
-<!-- Temporarily suppress, because too many errors. TODO(gsheasby): unsuppress
-        <module name="VisibilityModifier"/> --><!-- Java Coding Guidelines: Minimize mutability -->
+        <module name="VisibilityModifier"/> <!-- Java Coding Guidelines: Minimize mutability -->
         <module name="WhitespaceAfter"/> <!-- Java Style Guide: Horizontal whitespace -->
         <module name="WhitespaceAround"> <!-- Java Style Guide: Horizontal whitespace -->
             <property name="allowEmptyConstructors" value="true"/>
             <property name="allowEmptyMethods" value="true"/>
             <property name="allowEmptyTypes" value="true"/>
             <property name="allowEmptyLoops" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
             <property name="ignoreEnhancedForColon" value="false"/>
             <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
             <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
@@ -381,8 +434,10 @@
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
-        <!-- <module name="CyclomaticComplexity"/> Java Coding Guidelines: Reduce Cyclomatic Complexity -->
-        <!-- <module name="DesignForExtension"/> Java Coding Guidelines: Design for extension -->
+        <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+        <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
+            <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+        </module>
         <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
             <property name="scope" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
@@ -399,7 +454,7 @@
         <module name="LocalFinalVariableName"/> <!-- Java Style Guide: Local variable names -->
         <module name="LocalVariableName"> <!-- Java Style Guide: Local variable names -->
             <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
             <property name="allowOneCharVarInForLoop" value="true"/>
             <message key="name.invalidPattern" value="Local variable name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -414,10 +469,9 @@
         <module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
         <module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
         <module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
-        <module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
         <module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
             <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
         </module>
diff --git a/.baseline/copyright/001_apache-2.0.txt b/.baseline/copyright/001_apache-2.0.txt
index 397be59b856..54d4a0312b5 100644
--- a/.baseline/copyright/001_apache-2.0.txt
+++ b/.baseline/copyright/001_apache-2.0.txt
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/.baseline/eclipse/org.eclipse.jdt.core.prefs b/.baseline/eclipse/org.eclipse.jdt.core.prefs
index dc125f1d3f9..fc7a7ddf5ed 100644
--- a/.baseline/eclipse/org.eclipse.jdt.core.prefs
+++ b/.baseline/eclipse/org.eclipse.jdt.core.prefs
@@ -109,7 +109,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
 org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
diff --git a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
index 62d5a2d3868..f2990d9699f 100644
--- a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
+++ b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
@@ -5,13 +5,13 @@ formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=false
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#java;\#javax;\#org;\#com;\#;java;javax;org;com;
+org.eclipse.jdt.ui.importorder=;
 org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.overrideannotation=true
 org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * Copyright ${year} Palantir Technologies, Inc. All rights reserved.\n */\n\n${package_declaration}\n\n/**\n * \n */\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * (c) Copyright ${year} Palantir Technologies Inc. All rights reserved.\n */\n\n${package_declaration}\n\n/**\n * \n */\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
index f0d6bf80bf8..9aa48633a69 100644
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -25,24 +25,8 @@
         <option name="IF_BRACE_FORCE" value="3" />
         <option name="IMPORT_LAYOUT_TABLE">
           <value>
-            <package name="java" static="true" withSubpackages="true" />
-            <emptyLine />
-            <package name="javax" static="true" withSubpackages="true" />
-            <emptyLine />
-            <package name="org" static="true" withSubpackages="true" />
-            <emptyLine />
-            <package name="com" static="true" withSubpackages="true" />
-            <emptyLine />
             <package name="" static="true" withSubpackages="true" />
             <emptyLine />
-            <package name="java" static="false" withSubpackages="true" />
-            <emptyLine />
-            <package name="javax" static="false" withSubpackages="true" />
-            <emptyLine />
-            <package name="org" static="false" withSubpackages="true" />
-            <emptyLine />
-            <package name="com" static="false" withSubpackages="true" />
-            <emptyLine />
             <package name="" static="false" withSubpackages="true" />
           </value>
         </option>
@@ -66,11 +50,13 @@
         <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
         <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
         <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+        <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
         <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
         <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
         <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
         <option name="METHOD_PARAMETERS_WRAP" value="1" />
         <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
         <option name="OTHER_INDENT_OPTIONS">
           <value>
             <option name="INDENT_SIZE" value="4" />
@@ -82,7 +68,7 @@
             <option name="LABEL_INDENT_ABSOLUTE" value="false" />
             <option name="USE_RELATIVE_INDENTS" value="false" />
           </value>
-         </option>
+        </option>
         <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
           <value />
         </option>
@@ -100,30 +86,44 @@
           <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
           <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
           <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
           <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
           <option name="BINARY_OPERATION_WRAP" value="1" />
           <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="5" />
           <option name="DOWHILE_BRACE_FORCE" value="3" />
+          <option name="ENUM_CONSTANTS_WRAP" value="2" />
           <option name="EXTENDS_KEYWORD_WRAP" value="1" />
           <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="FIELD_ANNOTATION_WRAP" value="1" />
           <option name="FOR_BRACE_FORCE" value="3" />
           <option name="FOR_STATEMENT_WRAP" value="1" />
           <option name="IF_BRACE_FORCE" value="3" />
-          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+          <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+          <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
           <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
           <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
           <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+          <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
           <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
-          <option name="METHOD_PARAMETERS_WRAP" value="1" />
+          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+          <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+          <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+          <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
           <option name="PARENT_SETTINGS_INSTALLED" value="true" />
           <option name="RESOURCE_LIST_WRAP" value="5" />
+          <option name="RIGHT_MARGIN" value="120" />
           <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
           <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="TERNARY_OPERATION_WRAP" value="1" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
           <option name="THROWS_KEYWORD_WRAP" value="1" />
           <option name="THROWS_LIST_WRAP" value="1" />
           <option name="WHILE_BRACE_FORCE" value="3" />
+          <option name="WRAP_ON_TYPING" value="1" />
           <arrangement>
             <rules>
               <section>
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/Cleaner.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/Cleaner.java
index 5117975afd7..e294b045283 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/Cleaner.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/Cleaner.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.cleaner.api;
 
-import java.io.Closeable;
-
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.io.Closeable;
 
 /**
  * A {@link Cleaner} is good for two things: it scrubs and it punches. Scrubbing is an on-demand
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java
index a52a52249d6..71784ac9e4f 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.cleaner.api;
 
-import java.util.Set;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.transaction.api.Transaction;
+import java.util.Set;
 
 /**
  * This task allows us to essentially implement ON DELETE CASCADE.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java
index 9a157e1e83b..318f88e57fc 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java
@@ -15,26 +15,23 @@
  */
 package com.palantir.atlasdb.config;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.google.common.base.Preconditions;
+import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
+import com.palantir.logsafe.SafeArg;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.validation.constraints.Size;
-
 import org.immutables.value.Value;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.google.common.base.Preconditions;
-import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
-import com.palantir.logsafe.SafeArg;
-
 @JsonDeserialize(as = ImmutableLeaderConfig.class)
 @JsonSerialize(as = ImmutableLeaderConfig.class)
 @Value.Immutable
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java
index 3c3254c8f19..a63ab693b09 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.encoding;
 
-import java.nio.charset.StandardCharsets;
-
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.cache.Cache;
@@ -27,6 +23,8 @@
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.Longs;
 import com.google.common.primitives.UnsignedBytes;
+import java.nio.charset.StandardCharsets;
+import javax.annotation.Nullable;
 
 public final class PtBytes {
     private PtBytes() { }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/factory/TransactionManagerConsistencyResult.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/factory/TransactionManagerConsistencyResult.java
index 2f5c7f49860..5dc1ec654c8 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/factory/TransactionManagerConsistencyResult.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/factory/TransactionManagerConsistencyResult.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.factory;
 
 import java.util.Optional;
-
 import org.immutables.value.Value;
 
 /**
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/AsyncKeyValueService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/AsyncKeyValueService.java
index 00255154aaf..3a9b6d1d75d 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/AsyncKeyValueService.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/AsyncKeyValueService.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.util.Map;
-
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.atlasdb.metrics.Timed;
 import com.palantir.common.annotation.Idempotent;
+import java.util.Map;
 
 public interface AsyncKeyValueService extends AutoCloseable {
     /**
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/BatchColumnRangeSelection.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/BatchColumnRangeSelection.java
index e2f7dc7e738..4e6f1695c34 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/BatchColumnRangeSelection.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/BatchColumnRangeSelection.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.io.Serializable;
-import java.util.regex.Pattern;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.encoding.PtBytes;
+import java.io.Serializable;
+import java.util.regex.Pattern;
 
 public final class BatchColumnRangeSelection implements Serializable {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweeping.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweeping.java
index a8d1cd3e5fb..6298234ad9d 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweeping.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweeping.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.keyvalue.api;
 
 import java.util.Collection;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweepingRequest.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweepingRequest.java
index ad7cd6e88c2..37a945d9f3b 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweepingRequest.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CandidateCellForSweepingRequest.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.keyvalue.api;
 
 import java.util.OptionalInt;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java
index 28ab1ef93df..fc74f283540 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-
-import javax.annotation.Nonnull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.MoreObjects;
@@ -33,6 +24,12 @@
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import javax.annotation.Nonnull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a cell in the key-value store.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibility.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibility.java
index 2e5ebd44a22..55ca07115eb 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibility.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibility.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.keyvalue.api;
 
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
 /**
  * Indicates whether a {@link KeyValueService} supports check and set (CAS) and put unless exists (PUE) operations, and
  * if so the granularity with which it can provide feedback.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetRequest.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetRequest.java
index a0dd1f668f7..e9260f12d4a 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetRequest.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetRequest.java
@@ -15,15 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Optional;
-
 import javax.annotation.Nullable;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * A request to be supplied to KeyValueService.checkAndSet.
  * Use {@link #newCell(TableReference, Cell, byte[])} if the Cell is not yet stored,
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java
index 7e22275970a..137758299e8 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Joiner;
@@ -27,6 +22,10 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.encoding.PtBytes;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.regex.Pattern;
 
 public class ColumnRangeSelection implements Serializable {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java
index 36117560837..6e18288cdf2 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.io.Serializable;
-
 import com.palantir.common.persist.Persistable;
 import com.palantir.logsafe.Preconditions;
+import java.io.Serializable;
 
 public final class ColumnRangeSelections implements Serializable {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java
index a31c28b0256..95c09576da6 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-import java.util.SortedSet;
-
 import com.google.common.base.Joiner;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableSortedSet;
@@ -29,6 +23,11 @@
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.logsafe.Preconditions;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.SortedSet;
 
 public final class ColumnSelection implements Serializable {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java
index 9f8db2ec5b8..e4c3aa96c76 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.util.Collection;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-
 /**
  * A {@link KeyAlreadyExistsException} is thrown if an operation that conditionally updates a {@link KeyValueService}
  * fails because some data is already present in the underlying database.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java
index 7fb47fab118..31c693aeaa8 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.metrics.Timed;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
@@ -31,6 +26,10 @@
 import com.palantir.processors.DoDelegate;
 import com.palantir.util.paging.BasicResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * A service which stores key-value pairs.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java
index 1f18ad7e2fe..8da20e1414b 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.Validate;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
 import com.palantir.logsafe.Preconditions;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.Validate;
 
 public final class Namespace {
     public static final Namespace EMPTY_NAMESPACE = new Namespace("");
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java
index 26a6b987bba..ed44628f658 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import javax.annotation.Nonnull;
-
 import com.palantir.common.annotation.Immutable;
 import com.palantir.logsafe.Preconditions;
+import javax.annotation.Nonnull;
 
 /**
  * Represents a partial row to be used for range requests.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java
index ee19091f2a2..3e6997d7f20 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.Set;
-import java.util.SortedSet;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.NotThreadSafe;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -42,6 +32,14 @@
 import com.palantir.common.persist.Persistable;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.Pair;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Set;
+import java.util.SortedSet;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.NotThreadSafe;
 
 /**
  * Allows you to restrict a call on the database
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java
index 0b0e4f7fc79..0e4fd07db2b 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public final class RangeRequests {
     private RangeRequests() {
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedException.java
index 18b5615c659..aeb00ad9cae 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedException.java
@@ -16,14 +16,13 @@
 
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import com.palantir.common.exception.AtlasDbDependencyException;
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.SafeLoggable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 public class RetryLimitReachedException extends AtlasDbDependencyException implements SafeLoggable {
     private static final String MESSAGE = "Request was retried and failed each time for the request.";
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java
index ce2ca58190b..67fc4772597 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Collections2;
@@ -33,6 +27,11 @@
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.common.collect.Maps2;
 import com.palantir.logsafe.Preconditions;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
 
 public final class RowResult<T> implements Serializable {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java
index 3cb71f10cde..bcf766431f3 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java
@@ -15,17 +15,14 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.encoding.PtBytes;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableSweepResults.class)
 @JsonSerialize(as = ImmutableSweepResults.class)
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java
index eb185f128ec..c818bcc4a55 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.util.Objects;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
+import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
 
 public final class TableReference {
     private final Namespace namespace;
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java
index 2c4be1c2801..4791c2ba4ad 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import org.immutables.value.Value;
-
 import com.google.common.base.Preconditions;
 import com.palantir.common.persist.Persistable;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class TargetedSweepMetadata implements Persistable {
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java
index 043f8456b49..95125c817cf 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.logsafe.Preconditions;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Objects;
+import javax.annotation.Nonnull;
 
 /**
  * Represents a value in the key-value store (including its timestamp).
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/watch/NoOpTableWatchingService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/watch/NoOpTableWatchingService.java
index 72daaf87afd..7dcf5d2b56a 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/watch/NoOpTableWatchingService.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/watch/NoOpTableWatchingService.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.keyvalue.api.watch;
 
+import com.palantir.lock.watch.LockWatchReferences;
 import java.util.OptionalLong;
 import java.util.Set;
 
-import com.palantir.lock.watch.LockWatchReferences;
-
 public final class NoOpTableWatchingService implements TableWatchingService {
     public static final TableWatchingService INSTANCE = new NoOpTableWatchingService();
 
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/watch/TableWatchingService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/watch/TableWatchingService.java
index 5733f6a8d53..72c4548cb06 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/watch/TableWatchingService.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/watch/TableWatchingService.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.keyvalue.api.watch;
 
-import java.util.OptionalLong;
-import java.util.Set;
-
 import com.palantir.common.annotation.Idempotent;
 import com.palantir.lock.watch.LockWatchReferences;
+import java.util.OptionalLong;
+import java.util.Set;
 
 public interface TableWatchingService {
     /**
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/persistent/api/LogicalPersistentStore.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/persistent/api/LogicalPersistentStore.java
index 186b874b979..93f6c4e9fc8 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/persistent/api/LogicalPersistentStore.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/persistent/api/LogicalPersistentStore.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.persistent.api;
 
+import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore.StoreNamespace;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
 import javax.annotation.Nonnull;
 
-import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore.StoreNamespace;
-
 public interface LogicalPersistentStore<K, V> {
     /**
      * Retrieve the value associated with the given {@code key}.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/persistent/api/PhysicalPersistentStore.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/persistent/api/PhysicalPersistentStore.java
index fb0448dbcce..f5f4d5bf1f5 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/persistent/api/PhysicalPersistentStore.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/persistent/api/PhysicalPersistentStore.java
@@ -16,18 +16,14 @@
 
 package com.palantir.atlasdb.persistent.api;
 
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-
 import javax.annotation.Nonnull;
-
-import org.immutables.value.Value;
-
-import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
 import okio.ByteString;
+import org.immutables.value.Value;
 
 public interface PhysicalPersistentStore extends AutoCloseable {
     @Value.Immutable
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java
index 56a673c2e5f..7e73d735a9e 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.atlasdb.spi;
 
-import java.util.Optional;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampStoreInvalidator;
+import java.util.Optional;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public interface AtlasDbFactory {
     Logger log = LoggerFactory.getLogger(AtlasDbFactory.class);
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java
index 054a21eb359..ac30d04c0b6 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.spi;
 
-import java.util.Optional;
-
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import java.util.Optional;
 
 /**
  * Marker interface for various AtlasDb KeyValueService config objects.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java
index df536c363bf..2a55a8d1c65 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.transaction.api;
 
+import com.palantir.atlasdb.keyvalue.api.Cell;
 import java.util.List;
 import java.util.Map;
 
-import com.palantir.atlasdb.keyvalue.api.Cell;
-
 public interface ConstraintCheckable {
     /**
      * This method checks row, table, and foreign-key constraints on the values given in writes.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java
index f6e1d4a2710..385539cdb90 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.transaction.api;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
 
 public interface ConstraintCheckingTransaction extends Transaction {
     /**
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/LockWatchingCache.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/LockWatchingCache.java
index 08af73e8592..42371ca0988 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/LockWatchingCache.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/LockWatchingCache.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.transaction.api;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.lock.watch.LockWatchStateUpdate;
+import java.util.Map;
+import java.util.Set;
 
 public interface LockWatchingCache {
     /**
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/NoOpLockWatchingCache.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/NoOpLockWatchingCache.java
index c87add57e08..fcde13e145e 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/NoOpLockWatchingCache.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/NoOpLockWatchingCache.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.transaction.api;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.lock.watch.LockWatchStateUpdate;
+import java.util.Map;
+import java.util.Set;
 
 public final class NoOpLockWatchingCache implements LockWatchingCache {
     public static final NoOpLockWatchingCache INSTANCE = new NoOpLockWatchingCache();
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/NoOpTransactionLockWatchingCacheView.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/NoOpTransactionLockWatchingCacheView.java
index b06c1c127a9..b3a359056b6 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/NoOpTransactionLockWatchingCacheView.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/NoOpTransactionLockWatchingCacheView.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.transaction.api;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.lock.watch.LockWatchStateUpdate;
+import java.util.Map;
+import java.util.Set;
 
 public final class NoOpTransactionLockWatchingCacheView implements TransactionLockWatchingCacheView {
     public static final NoOpTransactionLockWatchingCacheView INSTANCE = new NoOpTransactionLockWatchingCacheView();
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RowLockDescriptorMapping.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RowLockDescriptorMapping.java
index f3b51744d81..cc936c417b0 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RowLockDescriptorMapping.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RowLockDescriptorMapping.java
@@ -16,13 +16,11 @@
 
 package com.palantir.atlasdb.transaction.api;
 
+import com.palantir.lock.LockDescriptor;
 import java.util.Map;
 import java.util.Optional;
-
 import org.immutables.value.Value;
 
-import com.palantir.lock.LockDescriptor;
-
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
 public abstract class RowLockDescriptorMapping {
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RowReference.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RowReference.java
index 93decdd83de..c119f9b3477 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RowReference.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RowReference.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.transaction.api;
 
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java
index 14e0b8a577e..0367c4626b4 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.api;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.function.BiFunction;
-import java.util.stream.Stream;
-
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -34,6 +27,12 @@
 import com.palantir.atlasdb.transaction.service.TransactionService;
 import com.palantir.common.annotation.Idempotent;
 import com.palantir.common.base.BatchingVisitable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
 
 /**
  * Provides the methods for a transaction with the key-value store.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionAndImmutableTsLock.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionAndImmutableTsLock.java
index 60f2ba7b33a..6ce1d045793 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionAndImmutableTsLock.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionAndImmutableTsLock.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.transaction.api;
 
-import org.immutables.value.Value;
-
 import com.palantir.lock.v2.LockToken;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface TransactionAndImmutableTsLock {
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java
index 04838e284c2..78a2196f278 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.transaction.api;
 
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Set;
-
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Set;
 
 /**
  * Thrown if there is a conflict detected when a transaction is committed.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionLockWatchingCacheView.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionLockWatchingCacheView.java
index f7c497edc63..ad8abf2bcc3 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionLockWatchingCacheView.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionLockWatchingCacheView.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.transaction.api;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.lock.watch.LockWatchStateUpdate;
+import java.util.Map;
+import java.util.Set;
 
 public interface TransactionLockWatchingCacheView {
     /**
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java
index e20c38bf43d..69d9f39c56b 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.api;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.cleaner.api.Cleaner;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.watch.NoOpTableWatchingService;
@@ -33,6 +31,7 @@
 import com.palantir.processors.DoNotDelegate;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.function.Supplier;
 
 @AutoDelegate
 public interface TransactionManager extends AutoCloseable {
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/AsyncTransactionService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/AsyncTransactionService.java
index 573414a179e..9a1f0117ec0 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/AsyncTransactionService.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/AsyncTransactionService.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.transaction.service;
 
-import java.util.Map;
-
 import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Map;
 
 public interface AsyncTransactionService {
     /**
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java
index e92e5baceb8..d7110b04b60 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.transaction.service;
 
-import java.util.Map;
-
-import javax.annotation.CheckForNull;
-
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.metrics.Timed;
+import java.util.Map;
+import javax.annotation.CheckForNull;
 
 /**
  * Transaction service is used by the atlas protocol to determine is a given transaction has been
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricNameCache.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricNameCache.java
index f3ea1012d25..a076652473c 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricNameCache.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricNameCache.java
@@ -16,18 +16,15 @@
 
 package com.palantir.atlasdb.util;
 
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.MetricRegistry;
 import com.github.benmanes.caffeine.cache.CacheLoader;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.palantir.tritium.metrics.registry.MetricName;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 /** Cache to avoid excessive string concatenation in MetricRegistry.name(clazz, metricName). */
 final class MetricNameCache {
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricsManager.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricsManager.java
index 95b4ca0329b..178dd57d100 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricsManager.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/util/MetricsManager.java
@@ -15,6 +15,17 @@
  */
 package com.palantir.atlasdb.util;
 
+import com.codahale.metrics.Gauge;
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.Metric;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.Timer;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.tritium.metrics.registry.MetricName;
+import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -24,24 +35,10 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.Metric;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.tritium.metrics.registry.MetricName;
-import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
-
 public class MetricsManager {
 
     private static final Logger log = LoggerFactory.getLogger(MetricsManager.class);
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java
index 41925156187..7f548996f3b 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.versions;
 
+import com.google.common.base.Suppliers;
 import java.io.PrintStream;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import com.google.common.base.Suppliers;
-
 public final class AtlasDbVersion {
     public static final String REPORT_VERSION_PROPERTY = "atlasdb.report.version";
     public static final String REPORT_VERSION_DEFAULT = "false";
@@ -54,4 +53,3 @@ public static String readVersion() {
                 .orElse(VERSION_UNKNOWN_STRING);
     }
 }
-
diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java
index cdb3acb34b1..2afab35a75b 100644
--- a/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java
+++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.config;
 
 import java.util.Collections;
-
 import org.junit.Test;
 
 public class LeaderConfigTest {
diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibilityTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibilityTest.java
index 4bb3787307c..3811610421a 100644
--- a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibilityTest.java
+++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/CheckAndSetCompatibilityTest.java
@@ -20,7 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.stream.Stream;
-
 import org.junit.Test;
 
 public class CheckAndSetCompatibilityTest {
diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsExceptionTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsExceptionTest.java
index 5a956ce7dd3..672b7b90026 100644
--- a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsExceptionTest.java
+++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsExceptionTest.java
@@ -18,17 +18,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.encoding.PtBytes;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.net.URL;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.encoding.PtBytes;
-
 public class KeyAlreadyExistsExceptionTest {
     @Test
     public void canDeserializeLegacyVersionsOfException() throws IOException, ClassNotFoundException {
diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedExceptionTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedExceptionTest.java
index 72ec01ae7ae..0458c34a941 100644
--- a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedExceptionTest.java
+++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/RetryLimitReachedExceptionTest.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.keyvalue.api;
 
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
 
 @SuppressWarnings("ThrowableInstanceNeverThrown")
 public class RetryLimitReachedExceptionTest {
diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/SweepResultsTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/SweepResultsTest.java
index a010f4c3a84..94e43e279b2 100644
--- a/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/SweepResultsTest.java
+++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/keyvalue/api/SweepResultsTest.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
+import com.palantir.atlasdb.encoding.PtBytes;
 import java.util.Optional;
-
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.palantir.atlasdb.encoding.PtBytes;
-
 public class SweepResultsTest {
     private static final SweepResults RESULTS = SweepResults.builder()
             .nextStartRow(Optional.of(PtBytes.toBytes("ABC")))
diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/Autobatchers.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/Autobatchers.java
index 3ce394ed6c2..cb92cec3f99 100644
--- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/Autobatchers.java
+++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/Autobatchers.java
@@ -16,19 +16,17 @@
 
 package com.palantir.atlasdb.autobatch;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.CompileTimeConstant;
+import com.lmax.disruptor.EventHandler;
+import com.palantir.logsafe.Preconditions;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
-
 import javax.annotation.Nullable;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.errorprone.annotations.CompileTimeConstant;
-import com.lmax.disruptor.EventHandler;
-import com.palantir.logsafe.Preconditions;
-
 public final class Autobatchers {
 
     private static final int DEFAULT_BUFFER_SIZE = 1024;
diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/BatchSizeRecorder.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/BatchSizeRecorder.java
index 384b8eefe8e..33e7fc10e46 100644
--- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/BatchSizeRecorder.java
+++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/BatchSizeRecorder.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.autobatch;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import com.codahale.metrics.Histogram;
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
+import javax.annotation.concurrent.NotThreadSafe;
 
 @NotThreadSafe // Disruptor runs the batching function on just one thread.
 public final class BatchSizeRecorder {
diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandler.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandler.java
index d4dd8927fa3..4f351af2bb7 100644
--- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandler.java
+++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandler.java
@@ -16,16 +16,14 @@
 
 package com.palantir.atlasdb.autobatch;
 
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
 import com.google.common.util.concurrent.SettableFuture;
 import com.lmax.disruptor.EventHandler;
 import com.palantir.logsafe.SafeArg;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class CoalescingBatchingEventHandler<T, R> implements EventHandler<BatchElement<T, R>> {
 
diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingRequestSupplier.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingRequestSupplier.java
index 0f7238257d4..e5439defc7f 100644
--- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingRequestSupplier.java
+++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/CoalescingRequestSupplier.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.autobatch;
 
+import com.palantir.logsafe.Preconditions;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
 
-import com.palantir.logsafe.Preconditions;
-
 public final class CoalescingRequestSupplier<T> implements CoalescingRequestFunction<Autobatchers.SupplierKey, T> {
 
     private final Supplier<T> supplier;
diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/DisruptorAutobatcher.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/DisruptorAutobatcher.java
index 4abfbd814b3..470f9f7bec9 100644
--- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/DisruptorAutobatcher.java
+++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/DisruptorAutobatcher.java
@@ -16,15 +16,6 @@
 
 package com.palantir.atlasdb.autobatch;
 
-import java.io.Closeable;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -35,6 +26,13 @@
 import com.lmax.disruptor.TimeoutException;
 import com.lmax.disruptor.dsl.Disruptor;
 import com.palantir.logsafe.Preconditions;
+import java.io.Closeable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * While this class is public, it shouldn't be used as API outside of AtlasDB because we
diff --git a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/IndependentBatchingEventHandler.java b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/IndependentBatchingEventHandler.java
index d19383d7cac..0d71cddbe25 100644
--- a/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/IndependentBatchingEventHandler.java
+++ b/atlasdb-autobatch/src/main/java/com/palantir/atlasdb/autobatch/IndependentBatchingEventHandler.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.autobatch;
 
+import com.lmax.disruptor.EventHandler;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
-import com.lmax.disruptor.EventHandler;
-
 final class IndependentBatchingEventHandler<T, R> implements EventHandler<BatchElement<T, R>> {
     private final Consumer<List<BatchElement<T, R>>> batchFunction;
     private final List<BatchElement<T, R>> pending;
diff --git a/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/BatchSizeRecorderTest.java b/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/BatchSizeRecorderTest.java
index 37b30b01520..b86b8d3aa5c 100644
--- a/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/BatchSizeRecorderTest.java
+++ b/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/BatchSizeRecorderTest.java
@@ -18,11 +18,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.codahale.metrics.Histogram;
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
+import org.junit.Test;
 
 public class BatchSizeRecorderTest {
     private static final String SAFE_IDENTIFIER = "identifier";
diff --git a/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandlerTests.java b/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandlerTests.java
index 8d16ef55311..87c0552480a 100644
--- a/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandlerTests.java
+++ b/atlasdb-autobatch/src/test/java/com/palantir/atlasdb/autobatch/CoalescingBatchingEventHandlerTests.java
@@ -22,21 +22,19 @@
 import static org.mockito.ArgumentMatchers.anySet;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.SettableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.immutables.value.Value;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.SettableFuture;
-
 @RunWith(MockitoJUnitRunner.class)
 public class CoalescingBatchingEventHandlerTests {
 
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraBackgroundSweeperIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraBackgroundSweeperIntegrationTest.java
index cb28d64886e..783ea463960 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraBackgroundSweeperIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraBackgroundSweeperIntegrationTest.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.containers.CassandraResource;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.sweep.AbstractBackgroundSweeperIntegrationTest;
 import com.palantir.atlasdb.util.MetricsManagers;
+import org.junit.ClassRule;
 
 public class CassandraBackgroundSweeperIntegrationTest extends AbstractBackgroundSweeperIntegrationTest {
     @ClassRule
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolIntegrationTest.java
index 92bb297b9c7..3191eff943a 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolIntegrationTest.java
@@ -18,6 +18,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.fail;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Range;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.containers.CassandraResource;
+import com.palantir.atlasdb.keyvalue.cassandra.pool.HostLocation;
+import com.palantir.atlasdb.util.MetricsManager;
+import com.palantir.atlasdb.util.MetricsManagers;
+import com.palantir.common.base.FunctionCheckedException;
 import java.net.InetSocketAddress;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -25,7 +35,6 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
-
 import org.apache.cassandra.thrift.KsDef;
 import org.apache.cassandra.thrift.TokenRange;
 import org.apache.thrift.TException;
@@ -33,17 +42,6 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Range;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.containers.CassandraResource;
-import com.palantir.atlasdb.keyvalue.cassandra.pool.HostLocation;
-import com.palantir.atlasdb.util.MetricsManager;
-import com.palantir.atlasdb.util.MetricsManagers;
-import com.palantir.common.base.FunctionCheckedException;
-
 public class CassandraClientPoolIntegrationTest {
     @ClassRule
     public static final CassandraResource CASSANDRA = new CassandraResource();
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionIntegrationTest.java
index 071a1bcd611..681d245f35f 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionIntegrationTest.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.palantir.atlasdb.containers.CassandraResource;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import com.palantir.atlasdb.containers.CassandraResource;
-
 public class CassandraConnectionIntegrationTest {
     @ClassRule
     public static final CassandraResource CASSANDRA = new CassandraResource();
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraGetCandidateCellsForSweepingTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraGetCandidateCellsForSweepingTest.java
index 31cdb612b4f..2a78d21f6c3 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraGetCandidateCellsForSweepingTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraGetCandidateCellsForSweepingTest.java
@@ -17,14 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.containers.CassandraResource;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping;
 import com.palantir.atlasdb.keyvalue.impl.AbstractGetCandidateCellsForSweepingTest;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class CassandraGetCandidateCellsForSweepingTest extends AbstractGetCandidateCellsForSweepingTest {
     @ClassRule
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceAsyncInitializationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceAsyncInitializationTest.java
index 3a5a3a8b28b..54213d6da0b 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceAsyncInitializationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceAsyncInitializationTest.java
@@ -17,16 +17,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.containers.UninitializedCassandraResource;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
-
 import org.awaitility.Awaitility;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import com.palantir.atlasdb.containers.UninitializedCassandraResource;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-
 public class CassandraKeyValueServiceAsyncInitializationTest {
     @ClassRule
     public static final UninitializedCassandraResource CASSANDRA = new UninitializedCassandraResource(
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceGetRowKeysInRangeTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceGetRowKeysInRangeTest.java
index 29eab2468c4..bd64cb016fe 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceGetRowKeysInRangeTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceGetRowKeysInRangeTest.java
@@ -20,17 +20,6 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertThat;
 
-import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.containers.CassandraResource;
@@ -40,8 +29,16 @@
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.common.random.RandomBytes;
-
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 import okio.ByteString;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class CassandraKeyValueServiceGetRowKeysInRangeTest {
     private static final TableReference GET_ROW_KEYS_TABLE = TableReference.createFromFullyQualifiedName("test.rows");
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceIntegrationTest.java
index 5429f91ce3b..f1be9246db9 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceIntegrationTest.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.ORIGINAL_METADATA;
+import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.clearOutMetadataTable;
+import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.insertGenericMetadataIntoLegacyCell;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
@@ -24,34 +27,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.ORIGINAL_METADATA;
-import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.clearOutMetadataTable;
-import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.insertGenericMetadataIntoLegacyCell;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
-
-import org.apache.cassandra.thrift.CfDef;
-import org.apache.cassandra.thrift.Compression;
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.thrift.TException;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
@@ -83,6 +58,28 @@
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
+import org.apache.cassandra.thrift.CfDef;
+import org.apache.cassandra.thrift.Compression;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.thrift.TException;
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
 
 @RunWith(Parameterized.class)
 public class CassandraKeyValueServiceIntegrationTest extends AbstractKeyValueServiceTest {
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceMultiCasIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceMultiCasIntegrationTest.java
index 11f237ac40f..c2660e04d15 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceMultiCasIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceMultiCasIntegrationTest.java
@@ -16,10 +16,9 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.containers.CassandraResource;
 import com.palantir.atlasdb.keyvalue.impl.AbstractMultiCasTest;
+import org.junit.ClassRule;
 
 public class CassandraKeyValueServiceMultiCasIntegrationTest extends AbstractMultiCasTest {
     @ClassRule
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweepTaskRunnerIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweepTaskRunnerIntegrationTest.java
index c6eaf933def..63654ee94b1 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweepTaskRunnerIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweepTaskRunnerIntegrationTest.java
@@ -15,17 +15,16 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.palantir.atlasdb.containers.CassandraResource;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest;
 import com.palantir.atlasdb.util.MetricsManagers;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Assert;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class CassandraKeyValueServiceSweepTaskRunnerIntegrationTest extends AbstractSweepTaskRunnerTest {
     @ClassRule
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationIntegrationTest.java
index 6a52dc43668..a913623ca67 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationIntegrationTest.java
@@ -19,20 +19,6 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
-
-import org.apache.cassandra.thrift.CfDef;
-import org.apache.cassandra.thrift.KsDef;
-import org.apache.thrift.TException;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -50,6 +36,18 @@
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+import org.apache.cassandra.thrift.CfDef;
+import org.apache.cassandra.thrift.KsDef;
+import org.apache.thrift.TException;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class CassandraKeyValueServiceTableCreationIntegrationTest {
     private static final TableReference GOOD_TABLE = TableReference.createFromFullyQualifiedName("foo.bar");
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableManipulationIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableManipulationIntegrationTest.java
index 20e16fbe9b7..cce5576f56d 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableManipulationIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableManipulationIntegrationTest.java
@@ -16,19 +16,11 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.ORIGINAL_METADATA;
 import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.clearOutMetadataTable;
 import static com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceTestUtils.insertGenericMetadataIntoLegacyCell;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.After;
-import org.junit.ClassRule;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -38,6 +30,11 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.junit.After;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class CassandraKeyValueServiceTableManipulationIntegrationTest {
     private static final TableReference UPPER_UPPER = TableReference.createFromFullyQualifiedName("TEST.TABLE");
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionIntegrationTest.java
index 83dc25ebad4..7a88ea6093f 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionIntegrationTest.java
@@ -15,6 +15,21 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.base.Suppliers;
+import com.google.common.util.concurrent.Futures;
+import com.palantir.atlasdb.containers.CassandraResource;
+import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.transaction.api.Transaction;
+import com.palantir.atlasdb.transaction.impl.AbstractTransactionTest;
+import com.palantir.atlasdb.transaction.impl.GetAsyncDelegate;
+import com.palantir.atlasdb.transaction.impl.TransactionTables;
+import com.palantir.atlasdb.transaction.service.SimpleTransactionService;
+import com.palantir.atlasdb.transaction.service.TransactionService;
+import com.palantir.atlasdb.transaction.service.WriteBatchingTransactionService;
+import com.palantir.flake.FlakeRetryingRule;
+import com.palantir.flake.ShouldRetry;
+import com.palantir.timestamp.TimestampManagementService;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -25,7 +40,6 @@
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
-
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -34,22 +48,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.google.common.base.Suppliers;
-import com.google.common.util.concurrent.Futures;
-import com.palantir.atlasdb.containers.CassandraResource;
-import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.transaction.api.Transaction;
-import com.palantir.atlasdb.transaction.impl.AbstractTransactionTest;
-import com.palantir.atlasdb.transaction.impl.GetAsyncDelegate;
-import com.palantir.atlasdb.transaction.impl.TransactionTables;
-import com.palantir.atlasdb.transaction.service.SimpleTransactionService;
-import com.palantir.atlasdb.transaction.service.TransactionService;
-import com.palantir.atlasdb.transaction.service.WriteBatchingTransactionService;
-import com.palantir.flake.FlakeRetryingRule;
-import com.palantir.flake.ShouldRetry;
-import com.palantir.timestamp.TimestampManagementService;
-
 @ShouldRetry // The first test can fail with a TException: No host tried was able to create the keyspace requested.
 @RunWith(Parameterized.class)
 public class CassandraKeyValueServiceTransactionIntegrationTest extends AbstractTransactionTest {
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsAsyncFallbackMechanismsTests.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsAsyncFallbackMechanismsTests.java
index e8297919995..767a85d039b 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsAsyncFallbackMechanismsTests.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsAsyncFallbackMechanismsTests.java
@@ -24,13 +24,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
@@ -44,6 +37,11 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.async.CassandraAsyncKeyValueServiceFactory;
+import java.util.Optional;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class CassandraKvsAsyncFallbackMechanismsTests {
     private static final TableReference TEST_TABLE = TableReference.createFromFullyQualifiedName("ns.pt_kvs_test");
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsSerializableTransactionTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsSerializableTransactionTest.java
index 5d6a6fb65ff..90670c383da 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsSerializableTransactionTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsSerializableTransactionTest.java
@@ -17,14 +17,6 @@
 
 import static org.mockito.Mockito.mock;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.function.UnaryOperator;
-
-import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.palantir.atlasdb.containers.CassandraResource;
 import com.palantir.atlasdb.sweep.metrics.TargetedSweepMetrics;
 import com.palantir.atlasdb.sweep.queue.MultiTableSweepQueueWriter;
@@ -33,6 +25,12 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.impl.AbstractSerializableTransactionTest;
 import com.palantir.atlasdb.transaction.impl.GetAsyncDelegate;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.function.UnaryOperator;
+import org.junit.ClassRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class CassandraKvsSerializableTransactionTest extends AbstractSerializableTransactionTest {
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraSweepProgressStoreIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraSweepProgressStoreIntegrationTest.java
index d0f4f3ed0b9..d037a82265d 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraSweepProgressStoreIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraSweepProgressStoreIntegrationTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.containers.CassandraResource;
 import com.palantir.atlasdb.sweep.progress.AbstractSweepProgressStoreTest;
+import org.junit.ClassRule;
 
 public class CassandraSweepProgressStoreIntegrationTest extends AbstractSweepProgressStoreTest {
     @ClassRule
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTargetedSweepIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTargetedSweepIntegrationTest.java
index 752f45a9e19..6d523f907dc 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTargetedSweepIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTargetedSweepIntegrationTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.containers.CassandraResource;
 import com.palantir.atlasdb.sweep.AbstractTargetedSweepTest;
+import org.junit.ClassRule;
 
 public class CassandraTargetedSweepIntegrationTest extends AbstractTargetedSweepTest {
     @ClassRule
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java
index 35f6fda1b4b..4e692b39d86 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProvider;
+import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProviders;
+import com.palantir.common.base.Throwables;
+import com.palantir.timestamp.InMemoryTimestampService;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -25,11 +29,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProvider;
-import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProviders;
-import com.palantir.common.base.Throwables;
-import com.palantir.timestamp.InMemoryTimestampService;
-
 /**
  * Utilities for ETE tests
  * Created by aloro on 12/04/2016.
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupIntegrationTest.java
index b62e9aa25ee..4bb3f56d405 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupIntegrationTest.java
@@ -18,12 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.concurrent.ThreadLocalRandom;
-
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.containers.CassandraResource;
@@ -31,6 +25,10 @@
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.flake.ShouldRetry;
 import com.palantir.timestamp.TimestampBoundStore;
+import java.util.concurrent.ThreadLocalRandom;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 @ShouldRetry
 public class CassandraTimestampBackupIntegrationTest {
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampIntegrationTest.java
index a67a365898d..357d6018b65 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampIntegrationTest.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.containers.CassandraResource;
 import com.palantir.flake.ShouldRetry;
 import com.palantir.timestamp.MultipleRunningTimestampServiceError;
 import com.palantir.timestamp.TimestampBoundStore;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 @ShouldRetry
 public class CassandraTimestampIntegrationTest {
diff --git a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorIntegrationTest.java b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorIntegrationTest.java
index 396cb5ebb6e..a9a4021f0c7 100644
--- a/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorIntegrationTest.java
+++ b/atlasdb-cassandra-integration-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorIntegrationTest.java
@@ -17,22 +17,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.containers.CassandraResource;
+import com.palantir.flake.ShouldRetry;
+import com.palantir.timestamp.MultipleRunningTimestampServiceError;
+import com.palantir.timestamp.TimestampBoundStore;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import com.google.common.collect.Iterables;
-import com.palantir.atlasdb.AtlasDbConstants;
-import com.palantir.atlasdb.containers.CassandraResource;
-import com.palantir.flake.ShouldRetry;
-import com.palantir.timestamp.MultipleRunningTimestampServiceError;
-import com.palantir.timestamp.TimestampBoundStore;
-
 @ShouldRetry
 public class CassandraTimestampStoreInvalidatorIntegrationTest {
     @ClassRule
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractDegradedClusterTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractDegradedClusterTest.java
index d94eb63f562..f9e2a666b0c 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractDegradedClusterTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractDegradedClusterTest.java
@@ -20,14 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.thrift.TException;
-import org.junit.Before;
-
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -41,6 +33,12 @@
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServices;
 import com.palantir.common.base.RunnableCheckedException;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.apache.thrift.TException;
+import org.junit.Before;
 
 public abstract class AbstractDegradedClusterTest {
     static final TableReference TEST_TABLE = TableReference.createWithEmptyNamespace("test_table");
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractNodeAvailabilityTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractNodeAvailabilityTest.java
index 46d93517949..ce345470af1 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractNodeAvailabilityTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/AbstractNodeAvailabilityTest.java
@@ -17,10 +17,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.ClusterAvailabilityStatus;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import org.junit.Test;
 
 public abstract class AbstractNodeAvailabilityTest extends AbstractDegradedClusterTest {
 
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraMultiNodeMultiCasTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraMultiNodeMultiCasTest.java
index d8bcadbbb3e..09810084612 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraMultiNodeMultiCasTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraMultiNodeMultiCasTest.java
@@ -16,10 +16,9 @@
 
 package com.palantir.cassandra.multinode;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.containers.ThreeNodeCassandraResource;
 import com.palantir.atlasdb.keyvalue.impl.AbstractMultiCasTest;
+import org.junit.ClassRule;
 
 public class CassandraMultiNodeMultiCasTest extends AbstractMultiCasTest {
     @ClassRule
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java
index d57c49bd75c..ed789ba47aa 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java
@@ -20,6 +20,16 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.containers.Containers;
+import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -34,7 +44,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.hamcrest.Description;
 import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
@@ -42,18 +51,6 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.AtlasDbConstants;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.containers.Containers;
-import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 public class CassandraSchemaLockTest {
     private static final int THREAD_COUNT = 4;
 
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/NodesDownTestSetup.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/NodesDownTestSetup.java
index 2daf9424107..a9bf48ff57f 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/NodesDownTestSetup.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/NodesDownTestSetup.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.cassandra.multinode;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.awaitility.Awaitility;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
-
 import com.google.common.base.Throwables;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
@@ -31,6 +23,12 @@
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl;
 import com.palantir.docker.compose.connection.DockerPort;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.AfterClass;
+import org.junit.ClassRule;
 
 public abstract class NodesDownTestSetup {
     private static final int CASSANDRA_THRIFT_PORT = 9160;
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownDeleteTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownDeleteTest.java
index 68e5d886e75..9b5a86dae09 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownDeleteTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownDeleteTest.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.cassandra.multinode;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import org.junit.Test;
 
 public class OneNodeDownDeleteTest extends AbstractDegradedClusterTest {
 
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownGetTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownGetTest.java
index f73b2e103ad..b85a22acd64 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownGetTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownGetTest.java
@@ -18,11 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -41,6 +36,9 @@
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import java.util.Map;
+import java.util.Set;
+import org.junit.Test;
 
 public class OneNodeDownGetTest extends AbstractDegradedClusterTest {
     private static final Set<Map.Entry<Cell, Value>> expectedRowEntries = ImmutableMap
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownMetadataTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownMetadataTest.java
index 0a903aa4403..e5fb57f9ce2 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownMetadataTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownMetadataTest.java
@@ -17,12 +17,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import org.junit.Test;
 
 public class OneNodeDownMetadataTest extends AbstractDegradedClusterTest {
     private static final TableReference TEST_TABLE_2 = TableReference.createWithEmptyNamespace("test_table_2");
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownPutTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownPutTest.java
index bf0d41e238d..b062849de8b 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownPutTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownPutTest.java
@@ -18,10 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.Map;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -31,6 +27,8 @@
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import java.util.Map;
+import org.junit.Test;
 
 public class OneNodeDownPutTest extends AbstractDegradedClusterTest {
     private static final Cell EMPTY_CELL = Cell.create(PtBytes.toBytes("empty"), FIRST_COLUMN);
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTableManipulationTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTableManipulationTest.java
index 498b7d7326d..cde2d59a578 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTableManipulationTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTableManipulationTest.java
@@ -17,13 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import org.junit.Test;
 
 public class OneNodeDownTableManipulationTest extends AbstractDegradedClusterTest {
     private static final TableReference TABLE_TO_DROP = TableReference.createWithEmptyNamespace("table_to_drop");
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTestSuite.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTestSuite.java
index 742fc643448..37665d98d3a 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTestSuite.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/OneNodeDownTestSuite.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.cassandra.multinode;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster;
 import java.util.Arrays;
-
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
         OneNodeDownGetTest.class,
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/ThreeNodesDownTestSuite.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/ThreeNodesDownTestSuite.java
index 2a84f419dc2..ea9ab606ffd 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/ThreeNodesDownTestSuite.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/ThreeNodesDownTestSuite.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.cassandra.multinode;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster;
 import java.util.Arrays;
-
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses(LessThanQuorumNodeAvailabilityTest.class)
 public final class ThreeNodesDownTestSuite extends NodesDownTestSetup {
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownGetTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownGetTest.java
index 0d41fbac75f..e0ec709a734 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownGetTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownGetTest.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.cassandra.multinode;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -28,6 +26,7 @@
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
 import com.palantir.common.base.ClosableIterator;
+import org.junit.Test;
 
 public class TwoNodesDownGetTest extends AbstractDegradedClusterTest {
 
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownMetadataTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownMetadataTest.java
index e486f7937b4..50583ffb57d 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownMetadataTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownMetadataTest.java
@@ -16,11 +16,10 @@
 
 package com.palantir.cassandra.multinode;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import org.junit.Test;
 
 public class TwoNodesDownMetadataTest extends AbstractDegradedClusterTest {
 
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownPutTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownPutTest.java
index 3b04c930eb4..47780e7d75b 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownPutTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownPutTest.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.cassandra.multinode;
 
-import java.util.Map;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -26,6 +22,8 @@
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import java.util.Map;
+import org.junit.Test;
 
 public class TwoNodesDownPutTest extends AbstractDegradedClusterTest {
     private static final Cell EMPTY_CELL = Cell.create(PtBytes.toBytes("empty"), FIRST_COLUMN);
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTableManipulationTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTableManipulationTest.java
index 8edc52cee4d..fddbe169fed 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTableManipulationTest.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTableManipulationTest.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.cassandra.multinode;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import org.junit.Test;
 
 public class TwoNodesDownTableManipulationTest extends AbstractDegradedClusterTest {
 
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTestSuite.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTestSuite.java
index 357f4b3b2b1..53afd1e4232 100644
--- a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTestSuite.java
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/TwoNodesDownTestSuite.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.cassandra.multinode;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster;
 import java.util.Arrays;
-
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.containers.ThreeNodeCassandraCluster;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
         LessThanQuorumNodeAvailabilityTest.class,
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java
index 9cc7de885ed..9d9f0de0c07 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.cassandra;
 
-import java.util.Optional;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.auto.service.AutoService;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -42,6 +35,11 @@
 import com.palantir.timestamp.PersistentTimestampServiceImpl;
 import com.palantir.timestamp.TimestampStoreInvalidator;
 import com.palantir.util.OptionalResolver;
+import java.util.Optional;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @AutoService(AtlasDbFactory.class)
 public class CassandraAtlasDbFactory implements AtlasDbFactory {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCellLoadingConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCellLoadingConfig.java
index d7adacb574c..a61b10f6fc3 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCellLoadingConfig.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCellLoadingConfig.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.cassandra;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraConstants;
+import org.immutables.value.Value;
 
 /**
  * Specifies limits on query sizes when loading cells from an underlying Cassandra key-value service.
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java
index 4c4be8eca49..f8b6115109b 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.cassandra;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableCassandraCredentialsConfig.class)
 @JsonSerialize(as = ImmutableCassandraCredentialsConfig.class)
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraJmxCompactionConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraJmxCompactionConfig.java
index d0973d203cd..ab0b730ea3d 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraJmxCompactionConfig.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraJmxCompactionConfig.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.cassandra;
 
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Strings;
 import com.palantir.logsafe.Preconditions;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableCassandraJmxCompactionConfig.class)
 @JsonSerialize(as = ImmutableCassandraJmxCompactionConfig.class)
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java
index 6317646bec0..ecaac366622 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.cassandra;
 
-import java.net.InetSocketAddress;
-import java.net.SocketTimeoutException;
-import java.util.Map;
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -38,6 +31,11 @@
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.net.InetSocketAddress;
+import java.net.SocketTimeoutException;
+import java.util.Map;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @AutoService(KeyValueServiceConfig.class)
 @JsonDeserialize(as = ImmutableCassandraKeyValueServiceConfig.class)
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceRuntimeConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceRuntimeConfig.java
index c295159adfc..c07567a822c 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceRuntimeConfig.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceRuntimeConfig.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.cassandra;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -24,6 +22,7 @@
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraConstants;
 import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig;
+import org.immutables.value.Value;
 
 @AutoService(KeyValueServiceRuntimeConfig.class)
 @JsonDeserialize(as = ImmutableCassandraKeyValueServiceRuntimeConfig.class)
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfig.java
index c87f546e6de..5dec95c7b70 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfig.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfig.java
@@ -15,17 +15,16 @@
  */
 package com.palantir.atlasdb.cassandra;
 
-import java.net.InetSocketAddress;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 import com.google.common.base.MoreObjects;
 import com.palantir.atlasdb.keyvalue.cassandra.async.CassandraAsyncKeyValueServiceFactory;
 import com.palantir.atlasdb.keyvalue.cassandra.pool.HostLocation;
 import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig;
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
+import java.net.InetSocketAddress;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 public class CassandraReloadableKvsConfig implements CassandraKeyValueServiceConfig {
     private final CassandraKeyValueServiceConfig config;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraServersConfigs.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraServersConfigs.java
index 86d7b473d9e..efbe6016135 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraServersConfigs.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraServersConfigs.java
@@ -17,12 +17,6 @@
 package com.palantir.atlasdb.cassandra;
 
 
-import java.net.InetSocketAddress;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -31,6 +25,10 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.net.InetSocketAddress;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.immutables.value.Value;
 
 public final class CassandraServersConfigs {
     private CassandraServersConfigs() {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/Blacklist.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/Blacklist.java
index ab551fdeb84..0be4bf39463 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/Blacklist.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/Blacklist.java
@@ -15,6 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
 import java.net.InetSocketAddress;
 import java.time.Clock;
 import java.util.Collection;
@@ -23,18 +30,9 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-
 public class Blacklist {
     private static final Logger log = LoggerFactory.getLogger(CassandraClientPool.class);
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java
index 98bf8a2d47a..dca58e4fdaa 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.palantir.logsafe.SafeArg;
 import java.util.Arrays;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.logsafe.SafeArg;
-
 public class CassandraApiVersion {
     private static final Logger LOGGER = LoggerFactory.getLogger(CassandraApiVersion.class);
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java
index 1689cbb87fa..2eea0d13eb0 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClient.java
@@ -15,11 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.metrics.Timed;
+import com.palantir.processors.AutoDelegate;
 import java.io.Closeable;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.CASResult;
 import org.apache.cassandra.thrift.CfDef;
 import org.apache.cassandra.thrift.Column;
@@ -43,10 +45,6 @@
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TProtocol;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.metrics.Timed;
-import com.palantir.processors.AutoDelegate;
-
 @SuppressWarnings({"all"}) // thrift variable names.
 @AutoDelegate
 public interface CassandraClient extends Closeable {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java
index 4eaf4e7c036..9aca477eeee 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java
@@ -15,16 +15,23 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.collect.Maps;
+import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.util.AtlasDbMetrics;
+import com.palantir.atlasdb.util.MetricsManager;
+import com.palantir.common.exception.AtlasDbDependencyException;
+import com.palantir.conjure.java.config.ssl.SslSocketFactories;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Map;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
-
 import org.apache.cassandra.thrift.AuthenticationRequest;
 import org.apache.cassandra.thrift.Cassandra;
 import org.apache.cassandra.thrift.Cassandra.Client;
@@ -41,16 +48,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Maps;
-import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.util.AtlasDbMetrics;
-import com.palantir.atlasdb.util.MetricsManager;
-import com.palantir.common.exception.AtlasDbDependencyException;
-import com.palantir.conjure.java.config.ssl.SslSocketFactories;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-
 public class CassandraClientFactory extends BasePooledObjectFactory<CassandraClient> {
     private static final Logger log = LoggerFactory.getLogger(CassandraClientFactory.class);
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientImpl.java
index f2649cfc3f7..eafe74a7b76 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientImpl.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientImpl.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -23,7 +27,6 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
-
 import org.apache.cassandra.thrift.CASResult;
 import org.apache.cassandra.thrift.Cassandra;
 import org.apache.cassandra.thrift.CfDef;
@@ -53,11 +56,6 @@
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 
-import com.google.common.collect.ImmutableSet;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 @SuppressWarnings({"all"}) // thrift variable names.
 public class CassandraClientImpl implements CassandraClient {
     private final Cassandra.Client client;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java
index b75c7c18362..50502a48462 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.util.Map;
-
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.processors.AutoDelegate;
+import java.net.InetSocketAddress;
+import java.util.Map;
 
 @AutoDelegate
 public interface CassandraClientPool {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java
index ad91fbc619f..10e5756ae71 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolImpl.java
@@ -15,21 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import org.apache.cassandra.thrift.NotFoundException;
-import org.apache.cassandra.thrift.TokenRange;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
@@ -53,6 +38,19 @@
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import org.apache.cassandra.thrift.NotFoundException;
+import org.apache.cassandra.thrift.TokenRange;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Feature breakdown:
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java
index e9b32e619a8..a988aea1a5c 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java
@@ -15,6 +15,17 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.codahale.metrics.Gauge;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.util.MetricsManager;
+import com.palantir.common.base.FunctionCheckedException;
+import com.palantir.common.pooling.PoolingContainer;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
@@ -27,7 +38,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.apache.thrift.transport.TFramedTransport;
@@ -37,18 +47,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.codahale.metrics.Gauge;
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.util.MetricsManager;
-import com.palantir.common.base.FunctionCheckedException;
-import com.palantir.common.pooling.PoolingContainer;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-
 public class CassandraClientPoolingContainer implements PoolingContainer<CassandraClient> {
     private static final Logger log = LoggerFactory.getLogger(CassandraClientPoolingContainer.class);
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java
index 1e449579986..6f5a6d00938 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
+import java.util.Set;
 
 public final class CassandraConstants {
     static final String DEFAULT_COMPRESSION_TYPE = "LZ4Compressor";
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java
index a63cdd3f731..f3a66685fea 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.List;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.processors.AutoDelegate;
+import java.util.List;
 
 @AutoDelegate
 public interface CassandraKeyValueService extends KeyValueService {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java
index 3154fa3a0b2..94396ae69a9 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceImpl.java
@@ -15,38 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import javax.annotation.Nullable;
-
-import org.apache.cassandra.thrift.CASResult;
-import org.apache.cassandra.thrift.CfDef;
-import org.apache.cassandra.thrift.Column;
-import org.apache.cassandra.thrift.ColumnOrSuperColumn;
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.cassandra.thrift.Deletion;
-import org.apache.cassandra.thrift.KsDef;
-import org.apache.cassandra.thrift.Mutation;
-import org.apache.cassandra.thrift.SlicePredicate;
-import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.InstrumentedExecutorService;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
@@ -134,8 +102,36 @@
 import com.palantir.util.paging.AbstractPagingIterable;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
-
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import javax.annotation.Nullable;
 import okio.ByteString;
+import org.apache.cassandra.thrift.CASResult;
+import org.apache.cassandra.thrift.CfDef;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.cassandra.thrift.Deletion;
+import org.apache.cassandra.thrift.KsDef;
+import org.apache.cassandra.thrift.Mutation;
+import org.apache.cassandra.thrift.SlicePredicate;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Each service can have one or many C* KVS.
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java
index 575afd8afd1..97f6be3c495 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java
@@ -15,26 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import org.apache.cassandra.thrift.CfDef;
-import org.apache.cassandra.thrift.Column;
-import org.apache.cassandra.thrift.ColumnOrSuperColumn;
-import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -57,6 +37,24 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.common.visitor.Visitor;
 import com.palantir.util.Pair;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import org.apache.cassandra.thrift.CfDef;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class CassandraKeyValueServices {
     private static final Logger log = LoggerFactory.getLogger(CassandraKeyValueService.class); // did this on purpose
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLogHelper.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLogHelper.java
index f5ed4d73630..7955d623bf9 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLogHelper.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLogHelper.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Range;
+import com.google.common.collect.RangeMap;
 import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.apache.cassandra.thrift.TokenRange;
 
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Range;
-import com.google.common.collect.RangeMap;
-
 public final class CassandraLogHelper {
     private CassandraLogHelper() {
         // Utility class.
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandler.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandler.java
index e00b7591ecc..5cefbda222c 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandler.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandler.java
@@ -15,6 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
+import com.palantir.common.exception.AtlasDbDependencyException;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
 import java.net.InetSocketAddress;
 import java.net.SocketTimeoutException;
 import java.time.Duration;
@@ -22,7 +27,6 @@
 import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Supplier;
-
 import org.apache.cassandra.thrift.InvalidRequestException;
 import org.apache.cassandra.thrift.TimedOutException;
 import org.apache.cassandra.thrift.UnavailableException;
@@ -30,12 +34,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
-import com.palantir.common.exception.AtlasDbDependencyException;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-
 class CassandraRequestExceptionHandler {
     private static final Logger log = LoggerFactory.getLogger(CassandraRequestExceptionHandler.class);
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableCreator.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableCreator.java
index 77e4ec859e5..f2a9e57a276 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableCreator.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableCreator.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.cassandra.thrift.Compression;
-import org.apache.thrift.TException;
-
 import com.datastax.driver.core.DataType;
 import com.datastax.driver.core.schemabuilder.SchemaBuilder;
 import com.datastax.driver.core.schemabuilder.TableOptions.CompactionOptions;
@@ -31,6 +25,10 @@
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.common.base.Throwables;
 import com.palantir.logsafe.SafeArg;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.cassandra.thrift.Compression;
+import org.apache.thrift.TException;
 
 class CassandraTableCreator {
     private static final String ROW = "key";
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableDropper.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableDropper.java
index 7621bf56677..2b0e1e953e4 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableDropper.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableDropper.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.cassandra.thrift.KsDef;
-import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.common.base.Throwables;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.cassandra.thrift.KsDef;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class CassandraTableDropper {
     private static final Logger log = LoggerFactory.getLogger(CassandraTableDropper.class);
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableMetadata.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableMetadata.java
index ede76082af0..5fde9060f4f 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableMetadata.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableMetadata.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
@@ -38,6 +30,12 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CassandraTableMetadata {
     private static final Logger log = LoggerFactory.getLogger(CassandraTableMetadata.class);
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableTruncator.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableTruncator.java
index 688608c4a53..2a724a261df 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableTruncator.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableTruncator.java
@@ -16,13 +16,11 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Collection;
-
-import org.apache.thrift.TException;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.common.base.Throwables;
+import java.util.Collection;
+import org.apache.thrift.TException;
 
 class CassandraTableTruncator {
     private final TracingQueryRunner queryRunner;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTables.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTables.java
index 36d2544d11e..c6841bf3edf 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTables.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTables.java
@@ -15,21 +15,19 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.common.base.FunctionCheckedException;
+import com.palantir.common.base.Throwables;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.apache.cassandra.thrift.CfDef;
 import org.apache.cassandra.thrift.KsDef;
 import org.apache.thrift.TException;
 
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.common.base.FunctionCheckedException;
-import com.palantir.common.base.Throwables;
-
 class CassandraTables {
     private final CassandraClientPool clientPool;
     private final CassandraKeyValueServiceConfig config;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupRunner.java
index 12dca328bae..af372282404 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupRunner.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBackupRunner.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.apache.cassandra.thrift.Compression;
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.cassandra.thrift.CqlResult;
-import org.apache.thrift.TException;
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -36,6 +24,15 @@
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.util.Pair;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.cassandra.thrift.Compression;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.cassandra.thrift.CqlResult;
+import org.apache.thrift.TException;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CassandraTimestampBackupRunner {
     private static final Logger log = LoggerFactory.getLogger(CassandraTimestampBackupRunner.class);
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java
index 1ae078c230b..7277a216970 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java
@@ -15,19 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.nio.ByteBuffer;
-import java.util.stream.Collectors;
-
-import javax.annotation.concurrent.GuardedBy;
-
-import org.apache.cassandra.thrift.CASResult;
-import org.apache.cassandra.thrift.Column;
-import org.apache.cassandra.thrift.ColumnOrSuperColumn;
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.cassandra.thrift.NotFoundException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.async.initializer.AsyncInitializer;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -43,6 +30,16 @@
 import com.palantir.timestamp.MultipleRunningTimestampServiceError;
 import com.palantir.timestamp.TimestampBoundStore;
 import com.palantir.util.debug.ThreadDumps;
+import java.nio.ByteBuffer;
+import java.util.stream.Collectors;
+import javax.annotation.concurrent.GuardedBy;
+import org.apache.cassandra.thrift.CASResult;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.cassandra.thrift.NotFoundException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class CassandraTimestampBoundStore implements TimestampBoundStore {
     private class InitializingWrapper extends AsyncInitializer implements AutoDelegate_TimestampBoundStore {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtils.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtils.java
index 56c7f1645cf..57d59cb08ea 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtils.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtils.java
@@ -15,14 +15,22 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Iterables;
+import com.google.common.io.BaseEncoding;
+import com.google.protobuf.ByteString;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.logging.LoggingArgs;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.util.Pair;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nullable;
-
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.CqlResult;
 import org.apache.cassandra.thrift.CqlRow;
@@ -30,17 +38,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Iterables;
-import com.google.common.io.BaseEncoding;
-import com.google.protobuf.ByteString;
-import com.palantir.atlasdb.AtlasDbConstants;
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.logging.LoggingArgs;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.util.Pair;
-
 public final class CassandraTimestampUtils {
     private static final Logger log = LoggerFactory.getLogger(CassandraTimestampUtils.class);
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraUtils.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraUtils.java
index c4de7ce8751..9d553ffc1ea 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraUtils.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraUtils.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.List;
-
-import org.apache.cassandra.thrift.TokenRange;
-import org.apache.cassandra.thrift.UnavailableException;
-
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException;
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import java.util.List;
+import org.apache.cassandra.thrift.TokenRange;
+import org.apache.cassandra.thrift.UnavailableException;
 
 public final class CassandraUtils {
     private CassandraUtils() {}
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java
index 55c7ddf4272..1a8a1890e47 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java
@@ -15,21 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import org.apache.cassandra.thrift.EndpointDetails;
-import org.apache.cassandra.thrift.InvalidRequestException;
-import org.apache.cassandra.thrift.KsDef;
-import org.apache.cassandra.thrift.NotFoundException;
-import org.apache.cassandra.thrift.TokenRange;
-import org.apache.commons.lang3.Validate;
-import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Verify;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
@@ -45,6 +30,19 @@
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.net.InetSocketAddress;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import org.apache.cassandra.thrift.EndpointDetails;
+import org.apache.cassandra.thrift.InvalidRequestException;
+import org.apache.cassandra.thrift.KsDef;
+import org.apache.cassandra.thrift.NotFoundException;
+import org.apache.cassandra.thrift.TokenRange;
+import org.apache.commons.lang3.Validate;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class CassandraVerifier {
     private static final Logger log = LoggerFactory.getLogger(CassandraVerifier.class);
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellDeleter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellDeleter.java
index 8bf492ffad5..aef885cca4f 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellDeleter.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellDeleter.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.function.LongUnaryOperator;
-
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.cassandra.thrift.Deletion;
-import org.apache.cassandra.thrift.Mutation;
-import org.apache.cassandra.thrift.SlicePredicate;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -37,6 +25,16 @@
 import com.palantir.atlasdb.keyvalue.cassandra.thrift.MutationMap;
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.common.base.Throwables;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.function.LongUnaryOperator;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.cassandra.thrift.Deletion;
+import org.apache.cassandra.thrift.Mutation;
+import org.apache.cassandra.thrift.SlicePredicate;
 
 class CellDeleter {
     private final CassandraClientPool clientPool;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoader.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoader.java
index 6d305adab21..2366cf61929 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoader.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoader.java
@@ -15,6 +15,20 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import com.google.common.primitives.UnsignedBytes;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceRuntimeConfig;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates;
+import com.palantir.atlasdb.logging.LoggingArgs;
+import com.palantir.atlasdb.util.AnnotatedCallable;
+import com.palantir.atlasdb.util.AnnotationType;
+import com.palantir.common.base.FunctionCheckedException;
+import com.palantir.logsafe.SafeArg;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -24,7 +38,6 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
-
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.ColumnParent;
 import org.apache.cassandra.thrift.ConsistencyLevel;
@@ -33,21 +46,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.primitives.UnsignedBytes;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceRuntimeConfig;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates;
-import com.palantir.atlasdb.logging.LoggingArgs;
-import com.palantir.atlasdb.util.AnnotatedCallable;
-import com.palantir.atlasdb.util.AnnotationType;
-import com.palantir.common.base.FunctionCheckedException;
-import com.palantir.logsafe.SafeArg;
-
 final class CellLoader {
     private static final Logger log = LoggerFactory.getLogger(CellLoader.class);
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcher.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcher.java
index e58999b5f25..03243704a55 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcher.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcher.java
@@ -16,12 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
@@ -31,6 +25,11 @@
 import com.palantir.atlasdb.cassandra.CassandraCellLoadingConfig;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
 
 /**
  * Divides a list of {@link Cell}s into batches for querying.
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellRangeDeleter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellRangeDeleter.java
index 0bfe361a6b6..0c53cf16d82 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellRangeDeleter.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellRangeDeleter.java
@@ -16,15 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.util.Map;
-import java.util.function.LongUnaryOperator;
-import java.util.function.ToLongFunction;
-
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.cassandra.thrift.Mutation;
-import org.apache.thrift.TException;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -35,6 +26,13 @@
 import com.palantir.atlasdb.keyvalue.cassandra.thrift.Mutations;
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.common.base.Throwables;
+import java.net.InetSocketAddress;
+import java.util.Map;
+import java.util.function.LongUnaryOperator;
+import java.util.function.ToLongFunction;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.cassandra.thrift.Mutation;
+import org.apache.thrift.TException;
 
 class CellRangeDeleter {
     private final CassandraClientPool clientPool;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellValuePutter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellValuePutter.java
index 685a29b6508..965de3204a1 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellValuePutter.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CellValuePutter.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.function.LongSupplier;
-
-import org.apache.cassandra.thrift.Column;
-import org.apache.cassandra.thrift.ColumnOrSuperColumn;
-import org.apache.cassandra.thrift.Mutation;
-
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -39,6 +29,14 @@
 import com.palantir.atlasdb.util.AnnotatedCallable;
 import com.palantir.atlasdb.util.AnnotationType;
 import com.palantir.common.base.FunctionCheckedException;
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.function.LongSupplier;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
+import org.apache.cassandra.thrift.Mutation;
 
 public class CellValuePutter {
     private static final Function<Map.Entry<Cell, Value>, Long> ENTRY_SIZING_FUNCTION = input ->
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitions.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitions.java
index 925f7024f22..a24b6f72908 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitions.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitions.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.cassandra.thrift.CfDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -32,6 +25,11 @@
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.logsafe.SafeArg;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.cassandra.thrift.CfDef;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class ColumnFamilyDefinitions {
     private static final Logger log = LoggerFactory.getLogger(CassandraKeyValueService.class); // did this on purpose
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutor.java
index 6ce2236ab1f..002297f1c7b 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutor.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutor.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.sweep.CellWithTimestamp;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 public interface CqlExecutor {
     /**
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorImpl.java
index c3ad0aa31a3..5f2bdeb0e4e 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorImpl.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorImpl.java
@@ -15,6 +15,22 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.cassandra.sweep.CellWithTimestamp;
+import com.palantir.atlasdb.logging.LoggingArgs;
+import com.palantir.common.annotation.Output;
+import com.palantir.common.base.FunctionCheckedException;
+import com.palantir.common.base.Throwables;
+import com.palantir.logsafe.Arg;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -30,7 +46,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.apache.cassandra.thrift.Compression;
 import org.apache.cassandra.thrift.ConsistencyLevel;
 import org.apache.cassandra.thrift.CqlPreparedResult;
@@ -40,23 +55,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.cassandra.sweep.CellWithTimestamp;
-import com.palantir.atlasdb.logging.LoggingArgs;
-import com.palantir.common.annotation.Output;
-import com.palantir.common.base.FunctionCheckedException;
-import com.palantir.common.base.Throwables;
-import com.palantir.logsafe.Arg;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-
 public class CqlExecutorImpl implements CqlExecutor {
     private final QueryExecutor queryExecutor;
     private Logger log = LoggerFactory.getLogger(CqlExecutor.class);
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlQuery.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlQuery.java
index 2cb2708334f..014ed14d62e 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlQuery.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlQuery.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.immutables.value.Value;
-
 import com.google.common.base.Stopwatch;
 import com.palantir.atlasdb.logging.KvsProfilingLogger;
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class CqlQuery {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlSinglePartitionBatchQuery.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlSinglePartitionBatchQuery.java
index 2951552ed32..3e9b1d165f6 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlSinglePartitionBatchQuery.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CqlSinglePartitionBatchQuery.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.google.common.collect.Lists;
 import com.palantir.logsafe.Arg;
+import java.util.List;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class CqlSinglePartitionBatchQuery {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java
index ec1b3f6d522..fe310127d67 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Set;
 
 public final class HiddenTables {
     private HiddenTables() {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HostPartitioner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HostPartitioner.java
index 4b5e7043e31..09c8980f912 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HostPartitioner.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HostPartitioner.java
@@ -15,17 +15,16 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.base.Function;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimaps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
 
 final class HostPartitioner {
     private HostPartitioner() {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/InstrumentedCassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/InstrumentedCassandraClient.java
index a85db9504a2..bc7c17faa32 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/InstrumentedCassandraClient.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/InstrumentedCassandraClient.java
@@ -15,11 +15,15 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.codahale.metrics.MetricRegistry;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.logging.LoggingArgs;
+import com.palantir.tritium.metrics.registry.MetricName;
+import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.ConsistencyLevel;
 import org.apache.cassandra.thrift.InvalidRequestException;
 import org.apache.cassandra.thrift.Mutation;
@@ -27,12 +31,6 @@
 import org.apache.cassandra.thrift.UnavailableException;
 import org.apache.thrift.TException;
 
-import com.codahale.metrics.MetricRegistry;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.logging.LoggingArgs;
-import com.palantir.tritium.metrics.registry.MetricName;
-import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
-
 @SuppressWarnings({"all"}) // thrift variable names.
 public class InstrumentedCassandraClient implements AutoDelegate_CassandraClient {
     private final CassandraClient delegate;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/LightweightOppToken.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/LightweightOppToken.java
index f5b3b0bde25..168a0666687 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/LightweightOppToken.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/LightweightOppToken.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Arrays;
-
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import java.util.Arrays;
 
 public class LightweightOppToken implements Comparable<LightweightOppToken> {
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClient.java
index 455b21fa80a..087ad22c28a 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClient.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClient.java
@@ -15,11 +15,15 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftObjectSizeUtils;
+import com.palantir.atlasdb.logging.KvsProfilingLogger;
+import com.palantir.atlasdb.logging.LoggingArgs;
+import com.palantir.logsafe.SafeArg;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.CASResult;
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
@@ -38,12 +42,6 @@
 import org.apache.cassandra.thrift.UnavailableException;
 import org.apache.thrift.TException;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftObjectSizeUtils;
-import com.palantir.atlasdb.logging.KvsProfilingLogger;
-import com.palantir.atlasdb.logging.LoggingArgs;
-import com.palantir.logsafe.SafeArg;
-
 @SuppressWarnings({"all"}) // thrift variable names.
 public class ProfilingCassandraClient implements AutoDelegate_CassandraClient {
     private final CassandraClient client;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/QosCassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/QosCassandraClient.java
index 9bd092dd613..258772b55e1 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/QosCassandraClient.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/QosCassandraClient.java
@@ -16,12 +16,20 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.base.Stopwatch;
+import com.google.common.base.Ticker;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.Query;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.QueryWeight;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers.QueryWeigher;
+import com.palantir.atlasdb.qos.metrics.QosMetrics;
+import com.palantir.atlasdb.util.MetricsManager;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.Compression;
 import org.apache.cassandra.thrift.ConsistencyLevel;
@@ -39,16 +47,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Stopwatch;
-import com.google.common.base.Ticker;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.Query;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.QueryWeight;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers.QueryWeigher;
-import com.palantir.atlasdb.qos.metrics.QosMetrics;
-import com.palantir.atlasdb.util.MetricsManager;
-
 @SuppressWarnings({"all"}) // thrift variable names.
 public class QosCassandraClient implements AutoDelegate_CassandraClient {
     private static final Logger log = LoggerFactory.getLogger(CassandraClient.class);
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java
index 54895ce0ff7..a9647cfa128 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RangeLoader.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.function.Supplier;
-
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.cassandra.thrift.SlicePredicate;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
@@ -34,6 +29,9 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.base.ClosableIterators;
+import java.util.function.Supplier;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.cassandra.thrift.SlicePredicate;
 
 public class RangeLoader {
     private final CassandraClientPool clientPool;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java
index cb3d773fe0a..817180cdb7a 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.SortedMap;
-
-import org.apache.cassandra.thrift.ColumnOrSuperColumn;
-
 import com.codahale.metrics.Meter;
 import com.palantir.atlasdb.AtlasDbMetricNames;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -37,6 +28,13 @@
 import com.palantir.util.Pair;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.SortedMap;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 
 public abstract class ResultsExtractor<T> {
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequest.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequest.java
index 8e77fd47b0f..9d40784a4eb 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequest.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequest.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.RetryLimitReachedException;
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 public class RetryableCassandraRequest<V, K extends Exception> {
     private final InetSocketAddress preferredHost;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java
index bd52cc06fac..8110aced654 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.cassandra.thrift.Column;
-import org.apache.cassandra.thrift.ColumnOrSuperColumn;
-
 import com.codahale.metrics.Meter;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -33,6 +23,14 @@
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.util.Pair;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 
 class RowColumnRangeExtractor {
     static class RowColumnRangeResult {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TaskRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TaskRunner.java
index e22f3290981..5361299890f 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TaskRunner.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TaskRunner.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.collect.Lists;
+import com.palantir.common.base.Throwables;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import com.google.common.collect.Lists;
-import com.palantir.common.base.Throwables;
-
 class TaskRunner {
     private ExecutorService executor;
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingCassandraClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingCassandraClient.java
index b4cc682d064..f2322dd5f2f 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingCassandraClient.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingCassandraClient.java
@@ -15,10 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.logging.LoggingArgs;
+import com.palantir.atlasdb.tracing.CloseableTrace;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.CASResult;
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
@@ -37,10 +39,6 @@
 import org.apache.cassandra.thrift.UnavailableException;
 import org.apache.thrift.TException;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.logging.LoggingArgs;
-import com.palantir.atlasdb.tracing.CloseableTrace;
-
 @SuppressWarnings({"all"}) // thrift variable names.
 public class TracingCassandraClient implements AutoDelegate_CassandraClient {
     private static final String SERVICE_NAME = "cassandra-thrift-client";
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingQueryRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingQueryRunner.java
index eb536b1f3de..9cf697f91a2 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingQueryRunner.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TracingQueryRunner.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.impl.TracingPrefsConfig;
 import java.nio.ByteBuffer;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.ImmutableSet;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.impl.TracingPrefsConfig;
-
 public class TracingQueryRunner {
     private final Logger log;
     private final TracingPrefsConfig tracingPrefs;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java
index 8688df068c5..79d230159d2 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
-import java.util.Map;
-
 import com.codahale.metrics.Meter;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.util.MetricsManager;
+import java.util.Map;
 
 class ValueExtractor extends ResultsExtractor<Value> {
     private final Map<Cell, Value> collector;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/WrappingQueryRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/WrappingQueryRunner.java
index b49e73a2e6f..8f234f963fc 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/WrappingQueryRunner.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/WrappingQueryRunner.java
@@ -15,11 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.MutationMap;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.ConsistencyLevel;
 import org.apache.cassandra.thrift.KeyPredicate;
@@ -27,10 +29,6 @@
 import org.apache.cassandra.thrift.UnavailableException;
 import org.apache.thrift.TException;
 
-import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.MutationMap;
-
 /**
  * Executes Thrift queries using the supplied {@link TracingQueryRunner}, wrapping {@link UnavailableException} with
  * {@link InsufficientConsistencyException}.
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueService.java
index e8a642ea092..4417f67261f 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueService.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueService.java
@@ -16,12 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async;
 
-import java.util.Map;
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.atlasdb.futures.FuturesCombiner;
 import com.palantir.atlasdb.keyvalue.api.AsyncKeyValueService;
@@ -36,6 +30,10 @@
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
+import java.util.Map;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class CassandraAsyncKeyValueService implements AsyncKeyValueService {
     private static final Logger log = LoggerFactory.getLogger(CassandraAsyncKeyValueService.class);
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueServiceFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueServiceFactory.java
index 9d5a5626673..32cacdb537c 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueServiceFactory.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueServiceFactory.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async;
 
-import java.util.Optional;
-
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.keyvalue.api.AsyncKeyValueService;
 import com.palantir.atlasdb.util.MetricsManager;
+import java.util.Optional;
 
 public interface CassandraAsyncKeyValueServiceFactory {
     Optional<AsyncKeyValueService> constructAsyncKeyValueService(
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CqlClientImpl.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CqlClientImpl.java
index 2fa3088edcb..aef8b8d2ee6 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CqlClientImpl.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/CqlClientImpl.java
@@ -16,8 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async;
 
-import java.util.concurrent.Executor;
-
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.ResultSet;
@@ -35,6 +33,7 @@
 import com.palantir.atlasdb.keyvalue.cassandra.async.statement.preparing.CachingStatementPreparer;
 import com.palantir.atlasdb.keyvalue.cassandra.async.statement.preparing.StatementPreparer;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.concurrent.Executor;
 
 public final class CqlClientImpl implements CqlClient {
     private static final class InitializingWrapper extends AsyncInitializer implements AutoDelegate_CqlClient {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/DefaultCassandraAsyncKeyValueServiceFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/DefaultCassandraAsyncKeyValueServiceFactory.java
index 0ad66e9bdb0..63dc5e624cc 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/DefaultCassandraAsyncKeyValueServiceFactory.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/DefaultCassandraAsyncKeyValueServiceFactory.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async;
 
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
 import com.codahale.metrics.InstrumentedExecutorService;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -36,6 +31,10 @@
 import com.palantir.common.concurrent.NamedThreadFactory;
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.tracing.Tracers;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 public final class DefaultCassandraAsyncKeyValueServiceFactory implements CassandraAsyncKeyValueServiceFactory {
     public static final CassandraAsyncKeyValueServiceFactory DEFAULT =
@@ -105,4 +104,3 @@ private ExecutorService instrumentExecutorService(ExecutorService executorServic
                 MetricRegistry.name(AsyncKeyValueService.class, "cassandra.executorService"));
     }
 }
-
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/client/creation/CqlClientFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/client/creation/CqlClientFactory.java
index ecbc9a88324..f0d4d56d20b 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/client/creation/CqlClientFactory.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/client/creation/CqlClientFactory.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async.client.creation;
 
-import java.util.Optional;
-
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.keyvalue.cassandra.async.CqlClient;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.Optional;
 
 public interface CqlClientFactory {
     Optional<CqlClient> constructClient(
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/client/creation/DefaultCqlClientFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/client/creation/DefaultCqlClientFactory.java
index d573c8952a9..07fe8d1f190 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/client/creation/DefaultCqlClientFactory.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/client/creation/DefaultCqlClientFactory.java
@@ -16,16 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async.client.creation;
 
-import java.net.InetSocketAddress;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-
-import javax.net.ssl.SSLContext;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.HostDistance;
 import com.datastax.driver.core.PoolingOptions;
@@ -47,6 +37,13 @@
 import com.palantir.atlasdb.keyvalue.cassandra.async.CqlClientImpl;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.net.InetSocketAddress;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+import javax.net.ssl.SSLContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultCqlClientFactory implements CqlClientFactory {
     public static final CqlClientFactory DEFAULT = new DefaultCqlClientFactory();
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/CqlQueryContext.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/CqlQueryContext.java
index e6babc6ee5e..3f6fe1c969a 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/CqlQueryContext.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/CqlQueryContext.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async.queries;
 
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface CqlQueryContext {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/GetQuerySpec.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/GetQuerySpec.java
index 79c1ec87ccb..da45d201c19 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/GetQuerySpec.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/GetQuerySpec.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async.queries;
 
-import java.nio.ByteBuffer;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Stream;
-
 import com.datastax.driver.core.ConsistencyLevel;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Row;
@@ -29,6 +24,10 @@
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService;
 import com.palantir.logsafe.Preconditions;
+import java.nio.ByteBuffer;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 public final class GetQuerySpec implements CqlQuerySpec<Optional<Value>> {
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/RowStreamAccumulator.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/RowStreamAccumulator.java
index b20d4cbe71b..f74964909bd 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/RowStreamAccumulator.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/queries/RowStreamAccumulator.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async.queries;
 
-import java.util.stream.Stream;
-
 import com.datastax.driver.core.Row;
+import java.util.stream.Stream;
 
 /**
  * {@code RowStreamAccumulator} defines an interface which should be implemented to process {@code Stream} of
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/statement/preparing/CachingStatementPreparer.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/statement/preparing/CachingStatementPreparer.java
index e8c3b4c4c93..4a7aa039793 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/statement/preparing/CachingStatementPreparer.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/statement/preparing/CachingStatementPreparer.java
@@ -16,8 +16,6 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.async.statement.preparing;
 
-import org.immutables.value.Value;
-
 import com.codahale.metrics.MetricRegistry;
 import com.datastax.driver.core.PreparedStatement;
 import com.github.benmanes.caffeine.cache.Cache;
@@ -27,6 +25,7 @@
 import com.palantir.atlasdb.keyvalue.cassandra.async.queries.QueryType;
 import com.palantir.tritium.metrics.caffeine.CaffeineCacheStats;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import org.immutables.value.Value;
 
 public final class CachingStatementPreparer implements StatementPreparer {
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetResponseDecoder.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetResponseDecoder.java
index 8b69f1a8f09..60cc3e129da 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetResponseDecoder.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetResponseDecoder.java
@@ -15,20 +15,17 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.cas;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.cassandra.thrift.Column;
-import org.apache.cassandra.thrift.CqlResult;
-import org.apache.cassandra.thrift.CqlRow;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
 import com.palantir.atlasdb.keyvalue.impl.ImmutableCheckAndSetResult;
-
+import java.util.Arrays;
+import java.util.List;
 import okio.ByteString;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.CqlResult;
+import org.apache.cassandra.thrift.CqlRow;
 
 final class CheckAndSetResponseDecoder {
     private static final String APPLIED_COLUMN = "[applied]";
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetRunner.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetRunner.java
index 4697f283895..a27bf0aaf26 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetRunner.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetRunner.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.cas;
 
-import org.apache.cassandra.thrift.Compression;
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.cassandra.thrift.CqlResult;
-import org.apache.cassandra.thrift.UnavailableException;
-import org.apache.thrift.TException;
-
 import com.palantir.atlasdb.keyvalue.api.CheckAndSetRequest;
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient;
 import com.palantir.atlasdb.keyvalue.cassandra.TracingQueryRunner;
 import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
-
 import okio.ByteString;
+import org.apache.cassandra.thrift.Compression;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.cassandra.thrift.CqlResult;
+import org.apache.cassandra.thrift.UnavailableException;
+import org.apache.thrift.TException;
 
 public class CheckAndSetRunner {
     private final TracingQueryRunner queryRunner;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java
index 84eedc8ed5a..7b7c31b0557 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/CassandraRangePagingIterable.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.paging;
 
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-
-import org.apache.cassandra.thrift.ColumnOrSuperColumn;
-import org.apache.cassandra.thrift.KeyRange;
-import org.apache.cassandra.thrift.KeySlice;
-import org.apache.cassandra.thrift.SlicePredicate;
-
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
@@ -33,6 +23,14 @@
 import com.palantir.util.paging.AbstractPagingIterable;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
+import org.apache.cassandra.thrift.KeyRange;
+import org.apache.cassandra.thrift.KeySlice;
+import org.apache.cassandra.thrift.SlicePredicate;
 
 public class CassandraRangePagingIterable<T>
         extends AbstractPagingIterable<RowResult<T>, TokenBackedBasicResultsPage<RowResult<T>, byte[]>> {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetter.java
index c210b6b4d12..eb8d315815e 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetter.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetter.java
@@ -18,7 +18,6 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.KeySlice;
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetters.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetters.java
index 625ea065676..6927d3c76b5 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetters.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ColumnGetters.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.paging;
 
+import com.google.common.collect.Maps;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.KeySlice;
 
-import com.google.common.collect.Maps;
-
 final class ColumnGetters {
     private ColumnGetters() {
         // Utility class
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/RowGetter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/RowGetter.java
index 2f201aa9f06..68b8e00a9bd 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/RowGetter.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/RowGetter.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.paging;
 
-import java.net.InetSocketAddress;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.cassandra.thrift.KeyRange;
-import org.apache.cassandra.thrift.KeySlice;
-import org.apache.cassandra.thrift.SlicePredicate;
-import org.apache.cassandra.thrift.UnavailableException;
-
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient;
@@ -33,6 +23,14 @@
 import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates;
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.common.base.Throwables;
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.cassandra.thrift.KeyRange;
+import org.apache.cassandra.thrift.KeySlice;
+import org.apache.cassandra.thrift.SlicePredicate;
+import org.apache.cassandra.thrift.UnavailableException;
 
 public class RowGetter {
     private CassandraClientPool clientPool;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ThriftColumnGetter.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ThriftColumnGetter.java
index 2c0f6c61381..cfcd9f0d191 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ThriftColumnGetter.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/paging/ThriftColumnGetter.java
@@ -18,7 +18,6 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.KeySlice;
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java
index f6ca865ed6d..53982775257 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraClientPoolMetrics.java
@@ -15,17 +15,16 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.pool;
 
+import com.codahale.metrics.Meter;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPool;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer;
+import com.palantir.atlasdb.util.MetricsManager;
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import com.codahale.metrics.Meter;
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPool;
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer;
-import com.palantir.atlasdb.util.MetricsManager;
-
 public class CassandraClientPoolMetrics {
     private final MetricsManager metricsManager;
     private final RequestMetrics aggregateMetrics;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraService.java
index e77d687fe15..dbbc979e342 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraService.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraService.java
@@ -15,27 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.pool;
 
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Random;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.apache.cassandra.thrift.EndpointDetails;
-import org.apache.cassandra.thrift.TokenRange;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
@@ -64,6 +43,25 @@
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.tritium.metrics.registry.MetricName;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.apache.cassandra.thrift.EndpointDetails;
+import org.apache.cassandra.thrift.TokenRange;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CassandraService implements AutoCloseable {
     // TODO(tboam): keep logging on old class?
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/Ec2HostLocationSupplier.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/Ec2HostLocationSupplier.java
index 2c88d537705..5b4ea419db4 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/Ec2HostLocationSupplier.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/Ec2HostLocationSupplier.java
@@ -38,13 +38,11 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.pool;
 
-import java.io.IOException;
-import java.util.function.Supplier;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Suppliers;
 import com.palantir.logsafe.Preconditions;
-
+import java.io.IOException;
+import java.util.function.Supplier;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocation.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocation.java
index c073ef940f1..3eb6549bcd6 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocation.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocation.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.pool;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.conjure.java.client.config.ImmutablesStyle;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableHostLocation.class)
 @JsonSerialize(as = ImmutableHostLocation.class)
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocationSupplier.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocationSupplier.java
index 59d996af784..bde1157a6e7 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocationSupplier.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocationSupplier.java
@@ -16,15 +16,13 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra.pool;
 
+import com.google.common.base.Suppliers;
+import com.palantir.logsafe.SafeArg;
 import java.util.Optional;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Suppliers;
-import com.palantir.logsafe.SafeArg;
-
 public final class HostLocationSupplier implements Supplier<Optional<HostLocation>> {
 
     private final Supplier<String> snitchSupplier;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHosts.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHosts.java
index b9059834896..724f4bc04a2 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHosts.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHosts.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.pool;
 
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer;
+import com.palantir.logsafe.Preconditions;
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,9 +24,6 @@
 import java.util.TreeMap;
 import java.util.concurrent.ThreadLocalRandom;
 
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer;
-import com.palantir.logsafe.Preconditions;
-
 /**
  * Weights hosts inversely by the number of active connections. {@link #getRandomHost()} should then be used to
  * pick a random host
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowForSweeping.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowForSweeping.java
index 7f9fa2a2c1f..a44c45d7e23 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowForSweeping.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowForSweeping.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.sweep;
 
-import java.util.List;
-import java.util.Set;
-import java.util.SortedMap;
-
-import org.immutables.value.Value;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedMap;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface CandidateRowForSweeping {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowsForSweepingIterator.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowsForSweepingIterator.java
index 6656a9a9f5c..68f1b903805 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowsForSweepingIterator.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CandidateRowsForSweepingIterator.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.sweep;
 
-import java.util.List;
-
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
@@ -26,6 +24,7 @@
 import com.palantir.atlasdb.keyvalue.cassandra.CqlExecutor;
 import com.palantir.atlasdb.keyvalue.cassandra.paging.RowGetter;
 import com.palantir.common.base.ClosableIterator;
+import java.util.List;
 
 public class CandidateRowsForSweepingIterator extends AbstractIterator<List<CandidateRowForSweeping>>
         implements ClosableIterator<List<CandidateRowForSweeping>> {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamp.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamp.java
index 6314b54d3ac..d734c89231a 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamp.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamp.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.sweep;
 
-import org.immutables.value.Value;
-
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class CellWithTimestamp {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamps.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamps.java
index 1f8fc5971ae..b58ddaf7171 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamps.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/CellWithTimestamps.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.sweep;
 
+import com.google.common.collect.Lists;
+import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.immutables.value.Value;
 
-import com.google.common.collect.Lists;
-import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping;
-
 @Value.Immutable
 public interface CellWithTimestamps {
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCandidateRowsForSweeping.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCandidateRowsForSweeping.java
index f2abcc4756e..714f354b04a 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCandidateRowsForSweeping.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCandidateRowsForSweeping.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.sweep;
 
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
@@ -32,6 +23,14 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.CqlExecutor;
 import com.palantir.atlasdb.keyvalue.cassandra.paging.RowGetter;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class GetCandidateRowsForSweeping {
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCellTimestamps.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCellTimestamps.java
index e0e7fca1315..e64530f9a3e 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCellTimestamps.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetCellTimestamps.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.sweep;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
@@ -32,6 +25,12 @@
 import com.palantir.atlasdb.keyvalue.cassandra.CqlExecutor;
 import com.palantir.atlasdb.keyvalue.cassandra.paging.RowGetter;
 import com.palantir.common.concurrent.PTExecutors;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
 
 public class GetCellTimestamps {
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetEmptyLatestValues.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetEmptyLatestValues.java
index 6ba1dd83870..2ab4f96ca59 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetEmptyLatestValues.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/GetEmptyLatestValues.java
@@ -15,17 +15,16 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.sweep;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class GetEmptyLatestValues {
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/ValuesLoader.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/ValuesLoader.java
index a6f6386b90c..2c50849e035 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/ValuesLoader.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/sweep/ValuesLoader.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.sweep;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
+import java.util.Map;
+import java.util.Set;
 
 public interface ValuesLoader {
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/MutationMap.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/MutationMap.java
index fb2e197aaba..991f45d2ae1 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/MutationMap.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/MutationMap.java
@@ -15,19 +15,16 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.thrift;
 
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
-import org.apache.cassandra.thrift.Mutation;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.concurrent.NotThreadSafe;
+import org.apache.cassandra.thrift.Mutation;
 
 @NotThreadSafe
 public class MutationMap {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/Mutations.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/Mutations.java
index 8fb52ea69fd..47a4cb276fe 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/Mutations.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/Mutations.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.thrift;
 
+import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete;
 import java.util.function.ToLongFunction;
-
 import org.apache.cassandra.thrift.Deletion;
 import org.apache.cassandra.thrift.Mutation;
 import org.apache.cassandra.thrift.SlicePredicate;
 
-import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete;
-
 public final class Mutations {
 
     private Mutations() { }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/QueryWeight.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/QueryWeight.java
index 82361c32c4e..e054edcf3cc 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/QueryWeight.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/QueryWeight.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.keyvalue.cassandra.thrift;
 
 import java.util.concurrent.TimeUnit;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/SlicePredicates.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/SlicePredicates.java
index 8b69b86c6ce..e262640d094 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/SlicePredicates.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/SlicePredicates.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.thrift;
 
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServices;
 import java.nio.ByteBuffer;
-
 import org.apache.cassandra.thrift.SlicePredicate;
 import org.apache.cassandra.thrift.SliceRange;
 import org.immutables.value.Value;
 
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServices;
-
 public final class SlicePredicates {
 
     private SlicePredicates() { }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftObjectSizeUtils.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftObjectSizeUtils.java
index 382147a7b9f..071eb016684 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftObjectSizeUtils.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftObjectSizeUtils.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.thrift;
 
+import com.google.common.collect.Maps;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.HashMap;
@@ -22,7 +23,6 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.CounterColumn;
@@ -37,8 +37,6 @@
 import org.apache.cassandra.thrift.SliceRange;
 import org.apache.cassandra.thrift.SuperColumn;
 
-import com.google.common.collect.Maps;
-
 public final class ThriftObjectSizeUtils {
 
     private static final long ONE_BYTE = 1;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighers.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighers.java
index 5a35db6ac1d..83c1739d5f2 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighers.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighers.java
@@ -15,12 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.thrift;
 
+import com.google.common.base.Suppliers;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
-
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.CqlResult;
 import org.apache.cassandra.thrift.KeyRange;
@@ -29,9 +30,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Suppliers;
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient;
-
 public final class ThriftQueryWeighers {
     private static final Logger log = LoggerFactory.getLogger(CassandraClient.class);
 
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/ThriftObjectSizeUtilsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/ThriftObjectSizeUtilsTest.java
index a165497d2e0..bb365225d8d 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/ThriftObjectSizeUtilsTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/ThriftObjectSizeUtilsTest.java
@@ -17,10 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftObjectSizeUtils;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.CqlResult;
@@ -33,10 +35,6 @@
 import org.apache.cassandra.thrift.SuperColumn;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftObjectSizeUtils;
-
 public class ThriftObjectSizeUtilsTest {
     private static final String TEST_NAME = "foo";
     private static final ByteBuffer TEST_NAME_BYTES = ByteBuffer.wrap(TEST_NAME.getBytes());
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactoryTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactoryTest.java
index b689f903ef1..3470cfa7f87 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactoryTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactoryTest.java
@@ -19,17 +19,15 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.spi.KeyValueServiceConfigHelper;
+import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig;
 import java.net.InetSocketAddress;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-import com.palantir.atlasdb.spi.KeyValueServiceConfigHelper;
-import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig;
-
 public class CassandraAtlasDbFactoryTest {
     private static final String KEYSPACE = "ks";
     private static final String KEYSPACE_2 = "ks2";
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigsTest.java
index 66f0b5a64b4..a8e136ae1e4 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigsTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigsTest.java
@@ -17,19 +17,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.config.AtlasDbConfigs;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.URISyntaxException;
 import java.net.URL;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.palantir.atlasdb.config.AtlasDbConfigs;
-
 public class CassandraKeyValueServiceConfigsTest {
     private static final String KEYSPACE = "ks";
     private static final String KEYSPACE_2 = "ks2";
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraMutationTimestampProvidersTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraMutationTimestampProvidersTest.java
index 6ab0ddd4ee4..79f9aeaad11 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraMutationTimestampProvidersTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraMutationTimestampProvidersTest.java
@@ -19,7 +19,6 @@
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.LongUnaryOperator;
-
 import org.junit.Test;
 
 public class CassandraMutationTimestampProvidersTest {
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfigTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfigTest.java
index c89cdad387f..3c61ce51a01 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfigTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfigTest.java
@@ -21,7 +21,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.Optional;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraServersConfigsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraServersConfigsTest.java
index 6c17f53a808..63edd1b98e5 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraServersConfigsTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraServersConfigsTest.java
@@ -18,6 +18,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.cassandra.CassandraServersConfigs.CassandraServersConfig;
+import com.palantir.atlasdb.cassandra.CassandraServersConfigs.CqlCapableConfig;
+import com.palantir.atlasdb.config.AtlasDbConfigs;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -25,13 +28,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.junit.Test;
 
-import com.palantir.atlasdb.cassandra.CassandraServersConfigs.CassandraServersConfig;
-import com.palantir.atlasdb.cassandra.CassandraServersConfigs.CqlCapableConfig;
-import com.palantir.atlasdb.config.AtlasDbConfigs;
-
 public class CassandraServersConfigsTest {
 
     private static final int TEST_THRIFT_PORT = 44;
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/QosCassandraClientTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/QosCassandraClientTest.java
index 540f5b2bdb8..450c984ee66 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/QosCassandraClientTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/QosCassandraClientTest.java
@@ -25,12 +25,22 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.base.Ticker;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient;
+import com.palantir.atlasdb.keyvalue.cassandra.CqlQuery;
+import com.palantir.atlasdb.keyvalue.cassandra.QosCassandraClient;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.QueryWeight;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers;
+import com.palantir.atlasdb.qos.metrics.QosMetrics;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-
 import javax.naming.LimitExceededException;
-
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.Compression;
@@ -44,19 +54,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Ticker;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraClient;
-import com.palantir.atlasdb.keyvalue.cassandra.CqlQuery;
-import com.palantir.atlasdb.keyvalue.cassandra.QosCassandraClient;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.QueryWeight;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.SlicePredicates;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers;
-import com.palantir.atlasdb.qos.metrics.QosMetrics;
-
 public class QosCassandraClientTest {
     private final CassandraClient mockClient = mock(CassandraClient.class);
     private final QosMetrics mockMetrics = mock(QosMetrics.class);
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/BlacklistTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/BlacklistTest.java
index e39067254c4..39847a4cbee 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/BlacklistTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/BlacklistTest.java
@@ -21,20 +21,18 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.net.InetSocketAddress;
-import java.time.Clock;
-import java.time.Duration;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig;
 import com.palantir.common.base.FunctionCheckedException;
+import java.net.InetSocketAddress;
+import java.time.Clock;
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicLong;
+import org.junit.Before;
+import org.junit.Test;
 
 public class BlacklistTest {
     private static final InetSocketAddress ADDRESS_1 = InetSocketAddress.createUnresolved("NW16XE", 123);
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java
index 6d0b10fb329..4d1beddb8bf 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java
@@ -25,6 +25,20 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.codahale.metrics.MetricRegistry;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig;
+import com.palantir.atlasdb.keyvalue.cassandra.pool.CassandraService;
+import com.palantir.atlasdb.util.MetricsManagers;
+import com.palantir.common.base.FunctionCheckedException;
+import com.palantir.common.exception.AtlasDbDependencyException;
+import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
+import com.palantir.tritium.metrics.registry.MetricName;
+import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
 import java.net.InetSocketAddress;
 import java.net.SocketTimeoutException;
 import java.util.Arrays;
@@ -39,7 +53,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.apache.cassandra.thrift.InvalidRequestException;
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Before;
@@ -48,21 +61,6 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.OngoingStubbing;
 
-import com.codahale.metrics.MetricRegistry;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig;
-import com.palantir.atlasdb.keyvalue.cassandra.pool.CassandraService;
-import com.palantir.atlasdb.util.MetricsManagers;
-import com.palantir.common.base.FunctionCheckedException;
-import com.palantir.common.exception.AtlasDbDependencyException;
-import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
-import com.palantir.tritium.metrics.registry.MetricName;
-import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
-
 public class CassandraClientPoolTest {
     private static final int POOL_REFRESH_INTERVAL_SECONDS = 3 * 60;
     private static final int TIME_BETWEEN_EVICTION_RUNS_SECONDS = 20;
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java
index deee1d7e734..98eb4f23d8f 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java
@@ -18,16 +18,14 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.net.InetSocketAddress;
-import java.nio.file.Paths;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig;
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
+import java.net.InetSocketAddress;
+import java.nio.file.Paths;
+import org.junit.Test;
 
 public class CassandraKeyValueServiceConfigTest {
     private static final InetSocketAddress SERVER_ADDRESS = InetSocketAddress.createUnresolved("localhost", 9160);
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicePueTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicePueTest.java
index 501dd61d684..1f16af6b887 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicePueTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicePueTest.java
@@ -18,17 +18,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
-
+import java.util.Map;
+import java.util.stream.Collectors;
 import okio.ByteString;
+import org.junit.Test;
 
 public class CassandraKeyValueServicePueTest {
     @Test
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesSchemaConsensusTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesSchemaConsensusTest.java
index d9473f8a59d..8e4ce4ec122 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesSchemaConsensusTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesSchemaConsensusTest.java
@@ -21,20 +21,18 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig;
 import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.Set;
-
 import org.apache.thrift.TException;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig;
-
 public class CassandraKeyValueServicesSchemaConsensusTest {
     private static CassandraKeyValueServiceConfig config = mock(CassandraKeyValueServiceConfig.class);
     private static CassandraKeyValueServiceConfig waitingConfig = mock(CassandraKeyValueServiceConfig.class);
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesTest.java
index 6b96ee81d59..0e1f0a9a825 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServicesTest.java
@@ -18,11 +18,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.Value;
+import org.junit.Test;
 
 public class CassandraKeyValueServicesTest {
     private static final byte[] DATA = PtBytes.toBytes("data");
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsWrapperTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsWrapperTest.java
index 6ef981ffb39..f0bc72a075d 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsWrapperTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKvsWrapperTest.java
@@ -23,12 +23,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.exception.NotInitializedException;
+import org.junit.Test;
 
 public class CassandraKvsWrapperTest {
     private static final CassandraKeyValueServiceImpl kvs = mock(CassandraKeyValueServiceImpl.class);
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandlerTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandlerTest.java
index d4e27e199c1..47f3cfd3873 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandlerTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraRequestExceptionHandlerTest.java
@@ -19,13 +19,16 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 import java.net.SocketTimeoutException;
 import java.util.Collection;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.apache.cassandra.thrift.InvalidRequestException;
 import org.apache.cassandra.thrift.TimedOutException;
 import org.apache.cassandra.thrift.UnavailableException;
@@ -33,11 +36,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
-
 public class CassandraRequestExceptionHandlerTest {
     private static final String MESSAGE = "a exception";
     private static final Exception CAUSE = new Exception();
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableOptionsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableOptionsTest.java
index 24dba653bd8..b76517ccd1b 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableOptionsTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTableOptionsTest.java
@@ -18,9 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.table.description.TableMetadata;
+import org.junit.Test;
 
 public class CassandraTableOptionsTest {
     private static final TableMetadata DENSELY_ACCESSED_WIDE_ROWS_METADATA
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorTest.java
index 313a53cfaf3..2f8ba7cb675 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampStoreInvalidatorTest.java
@@ -22,11 +22,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
-
 public class CassandraTimestampStoreInvalidatorTest {
     private static final long BACKUP_TIMESTAMP = 42;
 
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtilsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtilsTest.java
index 0a3063c5bf4..d93cba383b3 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtilsTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampUtilsTest.java
@@ -20,19 +20,17 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.util.Pair;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.CqlResult;
 import org.apache.cassandra.thrift.CqlRow;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.util.Pair;
-
 public class CassandraTimestampUtilsTest {
     private static final byte[] KEY_1 = {120};
     private static final String COLUMN_NAME_1 = "foo";
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifierTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifierTest.java
index 6f4da3dc6e1..0e66f1f69dd 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifierTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifierTest.java
@@ -20,20 +20,18 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import java.util.Arrays;
-
 import org.apache.cassandra.thrift.EndpointDetails;
 import org.apache.cassandra.thrift.KsDef;
 import org.apache.cassandra.thrift.TokenRange;
 import org.apache.thrift.TException;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedSet;
-import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
-
 public class CassandraVerifierTest {
     private static final String DC_1 = "dc1";
     private static final String DC_2 = "dc2";
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcherTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcherTest.java
index d10d5b00aa0..dc8a64e418a 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcherTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CellLoadingBatcherTest.java
@@ -23,6 +23,13 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.primitives.UnsignedBytes;
+import com.palantir.atlasdb.cassandra.CassandraCellLoadingConfig;
+import com.palantir.atlasdb.cassandra.ImmutableCassandraCellLoadingConfig;
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,17 +41,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.UnsignedBytes;
-import com.palantir.atlasdb.cassandra.CassandraCellLoadingConfig;
-import com.palantir.atlasdb.cassandra.ImmutableCassandraCellLoadingConfig;
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 @SuppressWarnings("unchecked") // AssertJ assertions
 public class CellLoadingBatcherTest {
     private static final int CROSS_COLUMN_LIMIT = 3;
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitionsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitionsTest.java
index 71a1eb60ae3..d5c414d960f 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitionsTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ColumnFamilyDefinitionsTest.java
@@ -18,14 +18,13 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.cassandra.thrift.CfDef;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import org.apache.cassandra.thrift.CfDef;
+import org.junit.Test;
 
 public class ColumnFamilyDefinitionsTest {
     private static final int FOUR_DAYS_IN_SECONDS = 4 * 24 * 60 * 60;
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorTest.java
index a6792b3b156..16d7380e3b2 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CqlExecutorTest.java
@@ -22,15 +22,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.nio.ByteBuffer;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.cassandra.thrift.CqlPreparedResult;
-import org.apache.cassandra.thrift.CqlResult;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentMatcher;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Uninterruptibles;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -38,6 +29,13 @@
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.common.concurrent.PTExecutors;
+import java.nio.ByteBuffer;
+import java.util.concurrent.TimeUnit;
+import org.apache.cassandra.thrift.CqlPreparedResult;
+import org.apache.cassandra.thrift.CqlResult;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatcher;
 
 public class CqlExecutorTest {
 
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java
index d8fd16dfe91..bd2e590bb82 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java
@@ -19,10 +19,9 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import org.junit.Test;
 
 public class HiddenTablesTest {
     @Test
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClientTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClientTest.java
index b792388ea50..38624be81c9 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClientTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/ProfilingCassandraClientTest.java
@@ -22,9 +22,12 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import java.nio.ByteBuffer;
 import java.util.List;
-
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.Compression;
@@ -37,11 +40,6 @@
 import org.junit.After;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 public class ProfilingCassandraClientTest {
     private static final CqlQuery CQL_QUERY = CqlQuery.builder()
             .safeQueryFormat("SELECT * FROM atlasdb.foo LIMIT 1;")
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequestTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequestTest.java
index 1e4f33f9552..754449c8bda 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequestTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/RetryableCassandraRequestTest.java
@@ -18,13 +18,11 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+import com.palantir.common.base.FunctionCheckedException;
 import java.net.InetSocketAddress;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.common.base.FunctionCheckedException;
-
 public class RetryableCassandraRequestTest {
     private static final int DEFAULT_PORT = 5000;
     private static final String HOSTNAME_1 = "1.0.0.0";
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/CachingStatementPreparerTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/CachingStatementPreparerTest.java
index 301ec949b9c..2fa22e958cc 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/CachingStatementPreparerTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/CachingStatementPreparerTest.java
@@ -20,9 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.datastax.driver.core.PreparedStatement;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -33,6 +30,8 @@
 import com.palantir.atlasdb.keyvalue.cassandra.async.statement.preparing.StatementPreparer;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
+import org.junit.Before;
+import org.junit.Test;
 
 public class CachingStatementPreparerTest {
 
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueServiceTests.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueServiceTests.java
index 03688a300dd..6e9ca90d4c7 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueServiceTests.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/async/CassandraAsyncKeyValueServiceTests.java
@@ -19,17 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -45,6 +34,15 @@
 import com.palantir.atlasdb.keyvalue.cassandra.async.queries.ImmutableCqlQueryContext;
 import com.palantir.atlasdb.keyvalue.cassandra.async.queries.ImmutableGetQueryParameters;
 import com.palantir.common.random.RandomBytes;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class CassandraAsyncKeyValueServiceTests {
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetQueriesTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetQueriesTest.java
index 9b71a7fdd66..1a19041d947 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetQueriesTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/cas/CheckAndSetQueriesTest.java
@@ -17,12 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.junit.Test;
-
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -31,6 +25,10 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.CqlQuery;
 import com.palantir.logsafe.Arg;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.Test;
 
 public class CheckAndSetQueriesTest {
     private static final TableReference TABLE_REFERENCE = TableReference.createFromFullyQualifiedName("ns.table");
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraServiceTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraServiceTest.java
index edfc3468e6d..0383096cd0e 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraServiceTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/CassandraServiceTest.java
@@ -17,12 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig;
@@ -31,6 +25,10 @@
 import com.palantir.atlasdb.keyvalue.cassandra.Blacklist;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer;
 import com.palantir.atlasdb.util.MetricsManagers;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.Optional;
+import org.junit.Test;
 
 public class CassandraServiceTest {
     private static final int DEFAULT_PORT = 5000;
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocationSupplierTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocationSupplierTest.java
index d7a64fdd3aa..cf90e9ea6db 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocationSupplierTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/HostLocationSupplierTest.java
@@ -20,7 +20,6 @@
 
 import java.util.Optional;
 import java.util.function.Supplier;
-
 import org.junit.Test;
 
 public class HostLocationSupplierTest {
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHostsTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHostsTest.java
index 3409642a6fb..ea2643f0462 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHostsTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/pool/WeightedHostsTest.java
@@ -18,18 +18,16 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer;
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NavigableMap;
-
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPoolingContainer;
-
 public class WeightedHostsTest {
 
     @Test
diff --git a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighersTest.java b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighersTest.java
index bf754364d04..ab9ad7c4215 100644
--- a/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighersTest.java
+++ b/atlasdb-cassandra/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/thrift/ThriftQueryWeighersTest.java
@@ -17,10 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers.QueryWeigher;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.thrift.CqlResult;
 import org.apache.cassandra.thrift.KeyRange;
@@ -28,10 +30,6 @@
 import org.apache.cassandra.thrift.Mutation;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.keyvalue.cassandra.thrift.ThriftQueryWeighers.QueryWeigher;
-
 public class ThriftQueryWeighersTest {
 
     private static final ByteBuffer BYTES1 = ByteBuffer.allocate(3);
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java
index 4b4d386e848..177ba9a4faa 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.cli;
 
-import java.util.concurrent.Callable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.cli.command.KvsMigrationCommand;
 import com.palantir.atlasdb.cli.command.ReadPunchTableCommand;
 import com.palantir.atlasdb.cli.command.ScrubQueueMigrationCommand;
@@ -27,9 +22,11 @@
 import com.palantir.atlasdb.cli.command.timestamp.CleanTransactionRange;
 import com.palantir.atlasdb.cli.command.timestamp.FastForwardTimestamp;
 import com.palantir.atlasdb.cli.command.timestamp.FetchTimestamp;
-
 import io.airlift.airline.Cli;
 import io.airlift.airline.Help;
+import java.util.concurrent.Callable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class AtlasCli {
 
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java
index 3c8d98936db..7a175bf9bd2 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.Callable;
-
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.AtlasDbConfigs;
 import com.palantir.atlasdb.config.AtlasDbRuntimeConfig;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
-
 import io.airlift.airline.Option;
 import io.airlift.airline.OptionType;
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.Callable;
 
 public abstract class AbstractCommand implements Callable<Integer> {
 
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigrators.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigrators.java
index 23e9441c30f..65bc9e7ce7c 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigrators.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigrators.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import org.immutables.value.Value;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -28,6 +25,8 @@
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.timestamp.TimestampManagementService;
+import org.immutables.value.Value;
+import org.slf4j.LoggerFactory;
 
 public final class KeyValueServiceMigrators {
     private static final OutputPrinter printer
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java
index b2283874dc5..1bcca3e1418 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.Callable;
-
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.cli.output.OutputPrinter;
@@ -32,10 +26,13 @@
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.services.DaggerAtlasDbServices;
 import com.palantir.atlasdb.services.ServicesConfigModule;
-
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
 import io.airlift.airline.OptionType;
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.Callable;
+import org.slf4j.LoggerFactory;
 
 @Command(name = "migrate", description = "Migrate your data from one key value service to another.")
 public class KvsMigrationCommand implements Callable<Integer> {
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ReadPunchTableCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ReadPunchTableCommand.java
index bf553eaae6b..6ed57a5be5e 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ReadPunchTableCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ReadPunchTableCommand.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.cleaner.KeyValueServicePuncherStore;
 import com.palantir.atlasdb.cleaner.PuncherStore;
 import com.palantir.atlasdb.cli.command.timestamp.AbstractTimestampCommand;
@@ -29,10 +23,13 @@
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
 import io.airlift.airline.OptionType;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import org.slf4j.LoggerFactory;
 
 @Command(name = "read-punch-table", description = "Given an epoch time in millis, read the timestamp recorded"
         + " just before it in the punch table.")
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ScrubQueueMigrationCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ScrubQueueMigrationCommand.java
index 0bb5cfbc99f..b16f0ef1030 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ScrubQueueMigrationCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/ScrubQueueMigrationCommand.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import java.io.PrintWriter;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ArrayListMultimap;
@@ -38,9 +32,12 @@
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.logsafe.Preconditions;
-
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
+import java.io.PrintWriter;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang3.StringUtils;
 
 @Command(name = "scrub-queue-migration",
         description = "Move the contents of the old scrub queue into the new "
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java
index d9a84dba1f5..cac570b856e 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.services.AtlasDbServicesFactory;
 import com.palantir.atlasdb.services.DaggerAtlasDbServices;
 import com.palantir.atlasdb.services.ServicesConfigModule;
 import com.palantir.common.base.Throwables;
 import com.palantir.logsafe.Preconditions;
+import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class SingleBackendCommand extends AbstractCommand {
     private static final Logger log = LoggerFactory.getLogger(SingleBackendCommand.class);
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java
index b6248efe53f..8197806474b 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Functions;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -45,9 +35,15 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
-
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.slf4j.LoggerFactory;
 
 @Command(name = "sweep", description = "Sweep old table rows")
 public class SweepCommand extends SingleBackendCommand {
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java
index e886d4a5788..4f8491cd7e2 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.cli.command.timestamp;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Throwables;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
@@ -32,9 +23,15 @@
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
 import io.airlift.airline.Option;
 import io.airlift.airline.OptionType;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractTimestampCommand extends SingleBackendCommand {
 
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java
index f2f65c597dd..79808fed324 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java
@@ -15,18 +15,15 @@
  */
 package com.palantir.atlasdb.cli.command.timestamp;
 
-import java.util.OptionalLong;
-
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.cli.output.OutputPrinter;
 import com.palantir.atlasdb.restore.V1TransactionsTableRangeDeleter;
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.timestamp.TimestampRange;
-
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
 import io.airlift.airline.OptionType;
+import java.util.OptionalLong;
+import org.slf4j.LoggerFactory;
 
 @Command(name = "clean-transactions", description = "Clean out the entries in a _transactions table for the "
         + "purpose of deleting potentially inconsistent transactions from an underlying database that lacks "
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java
index 276fdec6a9e..db7a6d32dd4 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.cli.command.timestamp;
 
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.cli.output.OutputPrinter;
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
-
 import io.airlift.airline.Command;
+import org.slf4j.LoggerFactory;
 
 @Command(name = "fast-forward", description = "Fast forward the stored upper limit of a persistent timestamp"
         + " service to the specified timestamp."
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java
index 0ba157db05e..111be29c2a5 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.cli.command.timestamp;
 
-import org.joda.time.DateTime;
-import org.joda.time.format.ISODateTimeFormat;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.cleaner.KeyValueServicePuncherStore;
 import com.palantir.atlasdb.cli.output.OutputPrinter;
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.logsafe.SafeArg;
-
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
 import io.airlift.airline.OptionType;
+import org.joda.time.DateTime;
+import org.joda.time.format.ISODateTimeFormat;
+import org.slf4j.LoggerFactory;
 
 @Command(name = "fetch", description = "Fetches a timestamp. By default"
         + " this will be a fresh timestamp unless otherwise specified.")
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/output/OutputPrinter.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/output/OutputPrinter.java
index 12505791a82..67c64285392 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/output/OutputPrinter.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/output/OutputPrinter.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.cli.output;
 
-import org.slf4j.Logger;
-import org.slf4j.helpers.MessageFormatter;
-
 import com.palantir.atlasdb.restore.OutputStateLogger;
 import com.palantir.logsafe.Arg;
+import org.slf4j.Logger;
+import org.slf4j.helpers.MessageFormatter;
 
 @SuppressWarnings("Slf4jConstantLogMessage")
 public class OutputPrinter implements OutputStateLogger {
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigratorsTest.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigratorsTest.java
index f3d38f8d753..4a56e91773a 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigratorsTest.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/KeyValueServiceMigratorsTest.java
@@ -28,11 +28,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Map;
-
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -63,6 +58,9 @@
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.timestamp.InMemoryTimestampService;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.Map;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 
 public class KeyValueServiceMigratorsTest {
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestFastForwardTimestampCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestFastForwardTimestampCommand.java
index 6090368d251..7b2982a192c 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestFastForwardTimestampCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestFastForwardTimestampCommand.java
@@ -17,8 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.cli.command.timestamp.FastForwardTimestamp;
 import com.palantir.atlasdb.cli.command.timestamp.FetchTimestamp;
 import com.palantir.atlasdb.cli.runner.InMemoryTestRunner;
@@ -36,8 +34,8 @@
 import com.palantir.lock.impl.LegacyTimelockService;
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.timestamp.InMemoryTimestampService;
-
 import io.airlift.airline.Command;
+import org.junit.Test;
 
 public class TestFastForwardTimestampCommand {
     private static final String TIMESTAMP_GROUP = "timestamp";
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java
index 7a66b555517..ea212845b2f 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java
@@ -17,16 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.Callable;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ObjectArrays;
@@ -38,6 +28,14 @@
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.services.AtlasDbServices;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.Callable;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class TestKvsMigrationCommand {
     private AtlasDbServices fromServices;
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestScrubQueueMigrationCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestScrubQueueMigrationCommand.java
index c39db4def75..d0055248b6f 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestScrubQueueMigrationCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestScrubQueueMigrationCommand.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import java.util.SortedMap;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
@@ -40,6 +31,13 @@
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.base.BatchingVisitables;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.util.SortedMap;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class TestScrubQueueMigrationCommand {
     private KeyValueService kvs;
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java
index 25ff84d579f..823bb527d25 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java
@@ -15,25 +15,22 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import java.net.URISyntaxException;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.concurrent.Callable;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cli.runner.AbstractTestRunner;
 import com.palantir.atlasdb.cli.runner.InMemoryTestRunner;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.services.AtlasDbServices;
-
 import io.airlift.airline.Cli;
 import io.airlift.airline.Command;
 import io.airlift.airline.Help;
 import io.airlift.airline.Option;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class TestSingleBackendCommand {
 
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java
index e4306181983..358d60ea530 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java
@@ -15,21 +15,6 @@
  */
 package com.palantir.atlasdb.cli.command;
 
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Scanner;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.BaseEncoding;
@@ -51,8 +36,20 @@
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.atlasdb.transaction.impl.SerializableTransactionManager;
 import com.palantir.timestamp.TimestampService;
-
 import io.airlift.airline.Command;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Scanner;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class TestSweepCommand {
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java
index 1c0b17877d2..d9d76805621 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java
@@ -18,26 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.AccessDeniedException;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Scanner;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.io.FileUtils;
-import org.joda.time.format.ISODateTimeFormat;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Lists;
@@ -64,6 +44,24 @@
 import com.palantir.lock.LockService;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.timestamp.TimestampService;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.AccessDeniedException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Scanner;
+import java.util.concurrent.TimeUnit;
+import org.apache.commons.io.FileUtils;
+import org.joda.time.format.ISODateTimeFormat;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class TestTimestampCommand {
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/output/OutputPrinterTest.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/output/OutputPrinterTest.java
index f4206d8dddb..04cfa852015 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/output/OutputPrinterTest.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/output/OutputPrinterTest.java
@@ -17,12 +17,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.cli.runner.StandardStreamUtilities;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
 public class OutputPrinterTest {
     private static final OutputPrinter print = new OutputPrinter(LoggerFactory.getLogger(OutputPrinter.class));
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java
index bdf188141c2..507335c7384 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.atlasdb.cli.runner;
 
-import java.net.URISyntaxException;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.concurrent.Callable;
-
-import org.apache.commons.lang3.ArrayUtils;
-
 import com.palantir.atlasdb.cli.AtlasCli;
 import com.palantir.atlasdb.cli.command.SingleBackendCommand;
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.services.AtlasDbServicesFactory;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import org.apache.commons.lang3.ArrayUtils;
 
 public abstract class AbstractTestRunner<S extends AtlasDbServices> implements SingleBackendCliTestRunner {
 
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java
index 87310df444b..a52c1e89a6b 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.cli.runner;
 
-import java.net.URISyntaxException;
-
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.services.AtlasDbServicesFactory;
+import java.net.URISyntaxException;
 
 public interface SingleBackendCliTestRunner extends AutoCloseable {
 
diff --git a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/test/StringValue.java b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/test/StringValue.java
index ab182f0f565..760f81ea530 100644
--- a/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/test/StringValue.java
+++ b/atlasdb-client/src/integrationInput/java/com/palantir/atlasdb/table/description/test/StringValue.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.table.description.test;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as=ImmutableStringValue.class)
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/AtlasDbConstants.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/AtlasDbConstants.java
index 9a95d496b6d..0454d0ef244 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/AtlasDbConstants.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/AtlasDbConstants.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb;
 
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.spi.AtlasDbFactory;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import java.util.Set;
 
 public final class AtlasDbConstants {
     private AtlasDbConstants() {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/DefaultTimestampCache.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/DefaultTimestampCache.java
index 4905d6fa86b..a8e0e507162 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/DefaultTimestampCache.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/DefaultTimestampCache.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.cache;
 
-import java.util.function.LongSupplier;
-
-import javax.annotation.Nullable;
-
 import com.codahale.metrics.MetricRegistry;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.Policy;
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.util.AtlasDbMetrics;
+import java.util.function.LongSupplier;
+import javax.annotation.Nullable;
 
 public final class DefaultTimestampCache implements TimestampCache {
     private final LongSupplier size;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/OffHeapTimestampCache.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/OffHeapTimestampCache.java
index d8c4f413079..4a334271e29 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/OffHeapTimestampCache.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/OffHeapTimestampCache.java
@@ -16,22 +16,6 @@
 
 package com.palantir.atlasdb.cache;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.LongSupplier;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
@@ -47,6 +31,19 @@
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.LongSupplier;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class OffHeapTimestampCache implements TimestampCache {
     private static final Logger log = LoggerFactory.getLogger(OffHeapTimestampCache.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampCache.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampCache.java
index b308b1eb5de..fcbe7c11116 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampCache.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampCache.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.cache;
 
-import javax.annotation.Nullable;
-
 import com.palantir.atlasdb.metrics.Timed;
+import javax.annotation.Nullable;
 
 public interface TimestampCache {
     /**
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampStore.java
index 56ea2667c5a..43af8e06fe7 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampStore.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/cache/TimestampStore.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.cache;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.persistent.api.LogicalPersistentStore;
@@ -31,7 +23,12 @@
 import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore.StoreNamespace;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.common.streams.KeyedStream;
-
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import okio.ByteString;
 
 /**
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/compress/CompressionUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/compress/CompressionUtils.java
index 5d30f905271..031ce63aa8f 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/compress/CompressionUtils.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/compress/CompressionUtils.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.atlasdb.compress;
 
-import java.io.IOException;
-
-import org.xerial.snappy.Snappy;
-
 import com.palantir.atlasdb.table.description.ColumnValueDescription.Compression;
 import com.palantir.common.base.Throwables;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.io.IOException;
+import org.xerial.snappy.Snappy;
 
 public final class CompressionUtils {
     private CompressionUtils() {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheck.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheck.java
index 068af0bf267..94f75e9f235 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheck.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheck.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.health;
 
-import java.util.Map;
-
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.AtlasDbMetricNames;
 import com.palantir.atlasdb.transaction.api.TimelockServiceStatus;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Map;
 
 public class MetricsBasedTimelockHealthCheck implements TimelockHealthCheck{
     private final MetricRegistry metricRegistry;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java
index 08995308d98..ef65bc1252a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import org.immutables.value.Value.Immutable;
-import org.immutables.value.Value.Parameter;
-
 import com.palantir.common.persist.Persistable;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import org.immutables.value.Value.Immutable;
+import org.immutables.value.Value.Parameter;
 
 @Immutable
 public interface StoredWriteReference extends Persistable {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReference.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReference.java
index 30fd7eb41a3..83f00185260 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReference.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReference.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableWriteReference.class)
 @JsonSerialize(as = ImmutableWriteReference.class)
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java
index 12be00e284f..ba09d5044b2 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -48,8 +38,16 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.concurrent.NamedThreadFactory;
 import com.palantir.common.concurrent.PTExecutors;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 @SuppressFBWarnings("SLF4J_ILLEGAL_PASSED_CLASS")
 public abstract class AbstractKeyValueService implements KeyValueService {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/Cells.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/Cells.java
index 8b63bc1b015..f0c8451297a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/Cells.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/Cells.java
@@ -15,21 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.collect.AbstractIterator;
@@ -52,6 +37,18 @@
 import com.palantir.atlasdb.transaction.api.TransactionConflictException.CellConflict;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.common.annotation.Output;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class Cells {
     private static final Logger log = LoggerFactory.getLogger(Cells.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/CheckAndSetResult.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/CheckAndSetResult.java
index 68c72168674..d153cdb64fb 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/CheckAndSetResult.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/CheckAndSetResult.java
@@ -17,7 +17,6 @@
 package com.palantir.atlasdb.keyvalue.impl;
 
 import java.util.List;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java
index 393226129ed..c121fe96c85 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -42,6 +37,10 @@
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * An implementation of KeyValueService which delegates reads to the first KeyValueService and
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java
index f5e8451c8b9..502fdfa539a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collection;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.keyvalue.api.AutoDelegate_KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import java.util.Collection;
 
 public abstract class ForwardingKeyValueService implements AutoDelegate_KeyValueService {
     @Override
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/GetCandidateCellsForSweepingShim.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/GetCandidateCellsForSweepingShim.java
index 516c2bffedf..cac87b735ed 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/GetCandidateCellsForSweepingShim.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/GetCandidateCellsForSweepingShim.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.PeekingIterator;
@@ -40,6 +32,13 @@
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.base.ClosableIterators;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 // This class provides a temporary implementation of the new call using existing KVS calls,
 // so that we can make this change in several smaller commits.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java
index ab61cf7c26c..eaae6a6740a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java
@@ -15,27 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentNavigableMap;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.ExecutorService;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
-import org.apache.commons.lang3.ArrayUtils;
-
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
@@ -76,6 +55,24 @@
 import com.palantir.common.base.ClosableIterators;
 import com.palantir.common.exception.TableMappingNotFoundException;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ExecutorService;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * In-memory (non-durable) key-value store implementation.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitioner.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitioner.java
index f59f533d6f5..cc5778a6cfa 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitioner.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitioner.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
@@ -33,6 +27,10 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.List;
+import java.util.NoSuchElementException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class IterablePartitioner {
     private static final Logger defaultLogger = LoggerFactory.getLogger(KeyValueService.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java
index fe18266c51c..bb426fd822d 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java
@@ -15,19 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.ExecutorService;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedMap;
@@ -57,6 +44,17 @@
 import com.palantir.util.crypto.Sha256Hash;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.ExecutorService;
+import org.apache.commons.lang3.tuple.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class KeyValueServices {
     private static final Logger log = LoggerFactory.getLogger(KeyValueServices.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java
index 1266c070d23..817c85b73b4 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Iterator;
-import java.util.Map;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.Value;
+import java.util.Iterator;
+import java.util.Map;
 
 public class LocalRowColumnRangeIterator implements RowColumnRangeIterator {
     private final Iterator<Map.Entry<Cell, Value>> it;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java
index b0cc1d0fcf0..71bd50f0583 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.Supplier;
-
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -52,6 +44,13 @@
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
 
 public final class ProfilingKeyValueService implements KeyValueService {
 
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/RowResults.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/RowResults.java
index bbdfa585a3b..b63d6ce2bfe 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/RowResults.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/RowResults.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.SortedMap;
-
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSortedMap;
@@ -32,6 +26,11 @@
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.common.collect.IterableView;
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.SortedMap;
 
 public class RowResults {
     private RowResults() { /* */ }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/StatsTrackingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/StatsTrackingKeyValueService.java
index ee2eac35fd0..020ef882002 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/StatsTrackingKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/StatsTrackingKeyValueService.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.io.PrintWriter;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.annotation.concurrent.ThreadSafe;
-
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -39,6 +30,13 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.base.ForwardingClosableIterator;
 import com.palantir.common.collect.MapEntries;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
 @SuppressWarnings("checkstyle:all") // too many warnings to fix
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueService.java
index 205c5d69d90..183373ff8e5 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueService.java
@@ -15,22 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Functions;
 import com.google.common.collect.Collections2;
@@ -60,6 +44,20 @@
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.timestamp.TimestampService;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This kvs wrapper tracks the approximate number of writes to every table
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueService.java
index b5db9861c80..4da4642fc60 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueService.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-
 import com.google.common.collect.ForwardingObject;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -54,6 +47,12 @@
 import com.palantir.logsafe.Preconditions;
 import com.palantir.tracing.DetachedSpan;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 
 /**
  * Wraps a {@link KeyValueService}'s methods with {@link com.palantir.tracing.Tracer}
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java
index 8303fa2f2bf..6fac7b2d26d 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableSet;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
 import java.util.Random;
 import java.util.Set;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSet;
-
 public class TracingPrefsConfig implements Runnable {
     private static final Logger log = LoggerFactory.getLogger(TracingPrefsConfig.class);
     private static final String TRACING_PREF_FILENAME = "atlas_tracing.prefs";
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java
index 49a91a99829..a0ca1852888 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.commons.lang3.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSetMultimap;
@@ -45,6 +35,14 @@
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import org.apache.commons.lang3.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This wrapper KVS should ensure that we're consistent across KVSs with:
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/KvsProfilingLogger.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/KvsProfilingLogger.java
index 5388a5b0b1c..5c0492c869e 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/KvsProfilingLogger.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/KvsProfilingLogger.java
@@ -15,6 +15,13 @@
  */
 package com.palantir.atlasdb.logging;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -22,20 +29,10 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-
 import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
-
 public class KvsProfilingLogger {
 
     public static final String SLOW_LOGGER_NAME = "kvs-slow-log-2";
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/LoggingArgs.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/LoggingArgs.java
index 2c12ee45262..4568b8ac16c 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/LoggingArgs.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/LoggingArgs.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.logging;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-import org.immutables.value.Value;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Collections2;
@@ -38,6 +29,13 @@
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import org.immutables.value.Value;
 
 /**
  * Includes utilities for generating logging args that may be safe or unsafe, depending on table metadata.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableData.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableData.java
index 808988a1d8e..f1d3d853f94 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableData.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableData.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.logging;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.immutables.value.Value;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService;
-
 @Value.Immutable
 public abstract class SafeLoggableData implements KeyValueServiceLogArbitrator {
     public abstract Set<TableReference> permittedTableReferences();
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableDataUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableDataUtils.java
index 2bd05d3cdbb..dc6f3c529f6 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableDataUtils.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/logging/SafeLoggableDataUtils.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.logging;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -31,6 +23,12 @@
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class SafeLoggableDataUtils {
     private static final Logger log = LoggerFactory.getLogger(SafeLoggableDataUtils.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/persistent/rocksdb/RocksDbPhysicalPersistentStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/persistent/rocksdb/RocksDbPhysicalPersistentStore.java
index 71198628368..47bf919104f 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/persistent/rocksdb/RocksDbPhysicalPersistentStore.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/persistent/rocksdb/RocksDbPhysicalPersistentStore.java
@@ -16,6 +16,15 @@
 
 package com.palantir.atlasdb.persistent.rocksdb;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Streams;
+import com.palantir.atlasdb.persistent.api.ImmutableStoreNamespace;
+import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.tracing.Tracers.ThrowingCallable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -31,9 +40,8 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javax.annotation.Nonnull;
-
+import okio.ByteString;
 import org.rocksdb.ColumnFamilyDescriptor;
 import org.rocksdb.ColumnFamilyHandle;
 import org.rocksdb.RocksDB;
@@ -41,18 +49,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Streams;
-import com.palantir.atlasdb.persistent.api.ImmutableStoreNamespace;
-import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.tracing.Tracers.ThrowingCallable;
-
-import okio.ByteString;
-
 /**
  * Implementation of the {@link PhysicalPersistentStore} using RocksDB as the underlying persistent storage. Created
  * {@link StoreNamespace}s are backed by RocksDB ColumnFamilies such that calling
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JacksonPersister.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JacksonPersister.java
index 3f9b2a9a82d..469bacb8f6a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JacksonPersister.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JacksonPersister.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.persister;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Throwables;
 import com.palantir.atlasdb.persist.api.Persister;
+import java.io.IOException;
 
 /**
  * A {@link Persister} that uses an {@link ObjectMapper} to serialize and deserialize objects
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JsonNodePersister.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JsonNodePersister.java
index 7445f087517..cdc72b0bb7a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JsonNodePersister.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/persister/JsonNodePersister.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.persister;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.palantir.atlasdb.persist.api.Persister;
 import com.palantir.common.base.Throwables;
+import java.io.IOException;
 
 public class JsonNodePersister implements Persister<JsonNode> {
     static final ObjectMapper mapper = new ObjectMapper();
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/ptobject/EncodingUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/ptobject/EncodingUtils.java
index 73170c459e7..2b8bbb11944 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/ptobject/EncodingUtils.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/ptobject/EncodingUtils.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.ptobject;
 
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.commons.lang3.ArrayUtils;
-
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Bytes;
 import com.google.common.primitives.Longs;
@@ -33,6 +25,12 @@
 import com.palantir.common.annotation.Output;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import org.apache.commons.lang3.ArrayUtils;
 
 @SuppressWarnings("checkstyle:all") // too many warnings to fix
 public class EncodingUtils {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointer.java
index ec041bd69dc..53fadfd10bf 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointer.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Map;
+import javax.annotation.Nullable;
 
 public abstract class AbstractTaskCheckpointer {
     private static final byte INCOMPLETE = 0;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java
index 36f338b7b13..289a77c0864 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/CompactSchema.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.io.File;
-import java.util.function.Supplier;
-
 import com.google.common.base.Suppliers;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.table.description.OptionalType;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.io.File;
+import java.util.function.Supplier;
 
 public enum CompactSchema implements AtlasSchema {
     INSTANCE;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/GeneralTaskCheckpointer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/GeneralTaskCheckpointer.java
index 7624d6aeb6c..9b37f84d600 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/GeneralTaskCheckpointer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/GeneralTaskCheckpointer.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -41,6 +36,10 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.atlasdb.transaction.api.TransactionTask;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 /**
  * This checkpointer creates a temporary table for checkpointing.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigrator.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigrator.java
index c2a3fe84f15..789d1bf8960 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigrator.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigrator.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.Map;
-
-import org.apache.commons.lang3.mutable.MutableLong;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -45,6 +39,10 @@
 import com.palantir.common.collect.Maps2;
 import com.palantir.util.Mutable;
 import com.palantir.util.Mutables;
+import java.util.Map;
+import org.apache.commons.lang3.mutable.MutableLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class KvsRangeMigrator implements RangeMigrator {
     private static final Logger log = LoggerFactory.getLogger(KvsRangeMigrator.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigratorBuilder.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigratorBuilder.java
index 8fcabae9c09..5a396d5bedb 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigratorBuilder.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/KvsRangeMigratorBuilder.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.Map;
-
 import com.google.common.base.Function;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.collect.Maps2;
 import com.palantir.logsafe.Preconditions;
+import java.util.Map;
 
 /**
  * Builder for a {@link KvsRangeMigrator}.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java
index 4ef49789962..37d0cb0bdae 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/SweepSchema.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.io.File;
-import java.util.function.Supplier;
-
 import com.google.common.base.Suppliers;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.table.description.OptionalType;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.io.File;
+import java.util.function.Supplier;
 
 public enum SweepSchema implements AtlasSchema {
     INSTANCE;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigrator.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigrator.java
index 1a9d373e3e0..e36f8066ea3 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigrator.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigrator.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
@@ -38,6 +30,13 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 
 public class TableMigrator {
     private final TableReference srcTable;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigratorBuilder.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigratorBuilder.java
index eea87ca200c..a68f89e8fd6 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigratorBuilder.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TableMigratorBuilder.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.table.description.RowNamePartitioner;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 /**
  * Builder for a {@link TableMigrator}.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TargetedSweepSchema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TargetedSweepSchema.java
index c47f11bff56..d545093edee 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TargetedSweepSchema.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TargetedSweepSchema.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.io.File;
-import java.util.function.Supplier;
-
 import com.google.common.base.Suppliers;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.StoredWriteReference;
@@ -29,6 +26,8 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.io.File;
+import java.util.function.Supplier;
 
 public enum TargetedSweepSchema implements AtlasSchema {
     INSTANCE;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigrator.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigrator.java
index 37155d60c54..9698cbdaa9a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigrator.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigrator.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.Map;
-
-import org.apache.commons.lang3.mutable.MutableLong;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Function;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -38,6 +32,10 @@
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.util.Mutable;
 import com.palantir.util.Mutables;
+import java.util.Map;
+import org.apache.commons.lang3.mutable.MutableLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TransactionRangeMigrator implements RangeMigrator {
     private static final Logger log = LoggerFactory.getLogger(TransactionRangeMigrator.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigratorBuilder.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigratorBuilder.java
index ab897fb40cc..e9c1041dc8f 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigratorBuilder.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/TransactionRangeMigratorBuilder.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.Map;
-
 import com.google.common.base.Function;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
@@ -24,6 +22,7 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.collect.Maps2;
 import com.palantir.logsafe.Preconditions;
+import java.util.Map;
 
 /**
  * Builder for a {@link TransactionRangeMigrator}.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select1Long.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select1Long.java
index 426b93d3511..fc1ebaa2493 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select1Long.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select1Long.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.schema.constraints.foreign;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.table.description.constraints.ForeignKeyConstraint;
 import com.palantir.atlasdb.table.description.constraints.tuples.TupleOf1;
+import java.util.List;
 
 public class Select1Long implements ForeignKeyConstraint {
     public static List<TupleOf1<Long>> getKeys(Long param) {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select2Long.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select2Long.java
index 33b7cb6c8ba..7281392ae11 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select2Long.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/Select2Long.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.schema.constraints.foreign;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.table.description.constraints.ForeignKeyConstraint;
 import com.palantir.atlasdb.table.description.constraints.tuples.TupleOf2;
+import java.util.List;
 
 public class Select2Long implements ForeignKeyConstraint {
     public static List<TupleOf2<Long, Long>> getKeys(Long param, Long param2) {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/SelectDynamicColumnLong.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/SelectDynamicColumnLong.java
index ed470803ed8..b0f6f927c19 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/SelectDynamicColumnLong.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/constraints/foreign/SelectDynamicColumnLong.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.schema.constraints.foreign;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.table.description.constraints.ForeignKeyConstraint;
 import com.palantir.atlasdb.table.description.constraints.tuples.TupleOf1;
+import java.util.List;
 
 public class SelectDynamicColumnLong implements ForeignKeyConstraint {
     public static List<TupleOf1<Long>> getKeys(List<Long> longs) {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java
index 00910ba3ed4..4dfff1ce276 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinition.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.schema.stream;
 
-import java.util.Map;
-import java.util.function.Supplier;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
@@ -28,6 +25,8 @@
 import com.palantir.atlasdb.table.description.render.StreamStoreRenderer;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.compression.StreamCompression;
+import java.util.Map;
+import java.util.function.Supplier;
 
 public class StreamStoreDefinition {
     // from ArrayList.MAX_ARRAY_SIZE on 64-bit systems
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilder.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilder.java
index 1fdd2cc2cd3..71a550b7daa 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilder.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilder.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.schema.stream;
 
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.common.compression.StreamCompression;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class StreamStoreDefinitionBuilder {
     private final ValueType valueType;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractGenericStreamStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractGenericStreamStore.java
index a56737739fe..03899318918 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractGenericStreamStore.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractGenericStreamStore.java
@@ -15,23 +15,6 @@
  */
 package com.palantir.atlasdb.stream;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.CheckForNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
@@ -46,6 +29,20 @@
 import com.palantir.common.compression.StreamCompression;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.util.ByteArrayIOStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.annotation.CheckForNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractGenericStreamStore<T> implements GenericStreamStore<T> {
     protected static final Logger log = LoggerFactory.getLogger(AbstractGenericStreamStore.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractPersistentStreamStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractPersistentStreamStore.java
index fb943b3f321..cc41be69de3 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractPersistentStreamStore.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/AbstractPersistentStreamStore.java
@@ -15,20 +15,9 @@
  */
 package com.palantir.atlasdb.stream;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.util.Map;
-import java.util.function.Supplier;
-
-import javax.annotation.Nullable;
-
-import com.google.common.base.Functions;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.CountingInputStream;
@@ -45,6 +34,13 @@
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.util.Pair;
 import com.palantir.util.crypto.Sha256Hash;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.util.Map;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 
 public abstract class AbstractPersistentStreamStore extends AbstractGenericStreamStore<Long>
         implements PersistentStreamStore {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/BlockConsumingInputStream.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/BlockConsumingInputStream.java
index ab04b84c355..ffe9e6659a8 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/BlockConsumingInputStream.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/BlockConsumingInputStream.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.stream;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.schema.stream.StreamStoreDefinition;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 public final class BlockConsumingInputStream extends InputStream {
     private final BlockGetter blockGetter;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/GenericStreamStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/GenericStreamStore.java
index 99a8bb79d25..1c729a80436 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/GenericStreamStore.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/GenericStreamStore.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.stream;
 
+import com.palantir.atlasdb.transaction.api.Transaction;
+import com.palantir.util.crypto.Sha256Hash;
 import java.io.File;
 import java.io.InputStream;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-import com.palantir.atlasdb.transaction.api.Transaction;
-import com.palantir.util.crypto.Sha256Hash;
-
 /**
  * Interface for storing streams specifically for atlasdb.
  */
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/PersistentStreamStore.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/PersistentStreamStore.java
index 4c01b644f98..1158778a8ac 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/PersistentStreamStore.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/PersistentStreamStore.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.stream;
 
-import java.io.InputStream;
-import java.util.Map;
-
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.util.Pair;
 import com.palantir.util.crypto.Sha256Hash;
+import java.io.InputStream;
+import java.util.Map;
 
 /**
  * Interface for storing streams specifically for atlasdb.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategy.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategy.java
index 12f9e73c86b..696838d4030 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategy.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategy.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.stream;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.logsafe.SafeArg;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.logsafe.SafeArg;
-
 public class StandardPeriodicBackoffStrategy implements StreamStoreBackoffStrategy {
     private final Logger log = LoggerFactory.getLogger(StandardPeriodicBackoffStrategy.class);
 
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StreamStorePersistenceConfiguration.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StreamStorePersistenceConfiguration.java
index 61890525fe2..aca20dd955d 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StreamStorePersistenceConfiguration.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/stream/StreamStorePersistenceConfiguration.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.stream;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.Preconditions;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableStreamStorePersistenceConfiguration.class)
 @JsonDeserialize(as = ImmutableStreamStorePersistenceConfiguration.class)
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java
index af17e351c9b..c3d9d6e32fd 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java
@@ -17,11 +17,10 @@
 
 import static com.palantir.logsafe.Preconditions.checkState;
 
-import org.immutables.value.Value;
-
 import com.google.common.primitives.Ints;
 import com.palantir.atlasdb.ptobject.EncodingUtils;
 import com.palantir.common.persist.Persistable;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface SweepTableIdentifier extends Persistable {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java
index 78bb666ba07..bf76df1d4f6 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java
@@ -15,18 +15,15 @@
  */
 package com.palantir.atlasdb.table.api;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
-import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.ConstraintCheckable;
 import com.palantir.common.base.BatchingVisitable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /*
  * Each AtlasDbTable should implement this interface.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbNamedImmutableTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbNamedImmutableTable.java
index 3a37c87cc55..34f83bd944e 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbNamedImmutableTable.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbNamedImmutableTable.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.table.api;
 
-import java.util.List;
-
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
+import java.util.List;
 
 /*
  * All named atlasdb tables should implement this interface.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java
index 961f088b137..fcf529cdc17 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.math.IntMath;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.CachePriority;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.logsafe.Preconditions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 abstract class AbstractDefinition {
     private static final Logger log = LoggerFactory.getLogger(AbstractDefinition.class);
@@ -122,4 +121,3 @@ void validateFirstRowComp(NameComponentDescription comp) {
         }
     }
 }
-
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java
index 1fb064e7579..301490daa66 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnMetadataDescription.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.concurrent.Immutable;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.ColumnMetadataDescription.Builder;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import java.util.Set;
+import javax.annotation.concurrent.Immutable;
 
 @Immutable
 public class ColumnMetadataDescription {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnValueDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnValueDescription.java
index 5f8e5f9ad27..f623df1507e 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnValueDescription.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ColumnValueDescription.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import org.apache.commons.lang3.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.protobuf.AbstractMessage;
@@ -48,6 +37,14 @@
 import com.palantir.common.persist.Persistables;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import org.apache.commons.lang3.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Immutable
 @SuppressWarnings("checkstyle:all") // too many warnings to fix
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/DynamicColumnDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/DynamicColumnDescription.java
index 18700a4da56..9192fe0125b 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/DynamicColumnDescription.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/DynamicColumnDescription.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import javax.annotation.concurrent.Immutable;
-
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.DynamicColumnDescription.Builder;
+import javax.annotation.concurrent.Immutable;
 
 @Immutable
 public class DynamicColumnDescription {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ExplicitRowNamePartitioner.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ExplicitRowNamePartitioner.java
index 76fc5d4fb24..2b933150138 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ExplicitRowNamePartitioner.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ExplicitRowNamePartitioner.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.Arrays;
-import java.util.List;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Bytes;
+import java.util.Arrays;
+import java.util.List;
 
 public class ExplicitRowNamePartitioner implements RowNamePartitioner {
     final ValueType valueType;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexDefinition.java
index e8db446a64b..43056af8297 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexDefinition.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexDefinition.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.List;
-import java.util.Set;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -28,6 +25,8 @@
 import com.palantir.atlasdb.table.description.render.Renderers;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Defines a secondary index for a schema.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java
index 549c5832c98..00ba6bd127a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/IndexMetadata.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.List;
-
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -28,6 +24,8 @@
 import com.palantir.atlasdb.table.description.IndexDefinition.IndexType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import javax.annotation.Nullable;
 
 public class IndexMetadata {
     final String name;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameComponentDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameComponentDescription.java
index a5e0b1b96d0..36cd7b20b4d 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameComponentDescription.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameComponentDescription.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.Set;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.ValueByteOrder;
 import com.palantir.logsafe.Preconditions;
+import java.util.Set;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 @Immutable
 public final class NameComponentDescription {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameMetadataDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameMetadataDescription.java
index b5b5588b744..0088bf504d3 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameMetadataDescription.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NameMetadataDescription.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.concurrent.Immutable;
-
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -36,6 +27,12 @@
 import com.palantir.atlasdb.ptobject.EncodingUtils;
 import com.palantir.common.base.Throwables;
 import com.palantir.util.Pair;
+import java.util.Iterator;
+import java.util.List;
+import javax.annotation.concurrent.Immutable;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 @Immutable
 public class NameMetadataDescription {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NamedColumnDescription.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NamedColumnDescription.java
index 90d7bc7cf27..8a090f1cc3b 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NamedColumnDescription.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/NamedColumnDescription.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import javax.annotation.concurrent.Immutable;
-
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.NamedColumnDescription.Builder;
+import javax.annotation.concurrent.Immutable;
 
 @Immutable
 public class NamedColumnDescription {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java
index 9caa89326f5..5173dbdcf9c 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schema.java
@@ -17,22 +17,6 @@
 
 import static java.util.stream.Collectors.toSet;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Suppliers;
@@ -57,6 +41,20 @@
 import com.palantir.atlasdb.table.description.render.TableRenderer;
 import com.palantir.atlasdb.table.description.render.TableRendererV2;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines a schema.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schemas.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schemas.java
index 3a1a894039f..36190cf81a9 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schemas.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/Schemas.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
@@ -27,6 +22,10 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public final class Schemas {
     private static final String INDEX_SUFFIX = "idx";
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableDefinition.java
index 764bb346dcf..cdc5831c14b 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableDefinition.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableDefinition.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.List;
-import java.util.Set;
-
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
@@ -36,6 +33,8 @@
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.common.persist.Persistable;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Defines a table for a schema.
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableMetadata.java
index 54b06a29ff4..a706d74d186 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableMetadata.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/TableMetadata.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
@@ -28,6 +24,8 @@
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.persist.Persistable;
+import java.util.List;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(get = {"get*", "is*", "has*"})
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/UniformRowNamePartitioner.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/UniformRowNamePartitioner.java
index 0fae5596e18..18483547bac 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/UniformRowNamePartitioner.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/UniformRowNamePartitioner.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.encoding.PtBytes;
+import java.util.List;
 
 public class UniformRowNamePartitioner implements RowNamePartitioner {
     final ValueType valueType;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ValueType.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ValueType.java
index 5ba2010b92f..52f1f2991af 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ValueType.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/ValueType.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.util.UUID;
-
-import org.json.simple.JSONValue;
-
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.ptobject.EncodingUtils;
 import com.palantir.util.Pair;
 import com.palantir.util.crypto.Sha256Hash;
+import java.util.UUID;
+import org.json.simple.JSONValue;
 
 public enum ValueType {
     /**
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ConstraintMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ConstraintMetadata.java
index c2fb3518b51..2f052870db4 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ConstraintMetadata.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ConstraintMetadata.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.table.description.constraints;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 public final class ConstraintMetadata {
     private final List<RowConstraintMetadata> rowConstraints;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ForeignKeyConstraintMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ForeignKeyConstraintMetadata.java
index a8f4309b0a5..607e2d867dd 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ForeignKeyConstraintMetadata.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/ForeignKeyConstraintMetadata.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.table.description.constraints;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import java.util.Collections;
+import java.util.List;
 
 public final class ForeignKeyConstraintMetadata {
 
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/RowConstraintMetadata.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/RowConstraintMetadata.java
index a9274342f80..9d889f7c8a5 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/RowConstraintMetadata.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/RowConstraintMetadata.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.table.description.constraints;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import java.util.Collections;
+import java.util.List;
 
 public class RowConstraintMetadata {
     private final Class<? extends RowConstraint> constraintClass;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/tuples/TupleOf4.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/tuples/TupleOf4.java
index 35990e78f8d..82dd836a66c 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/tuples/TupleOf4.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/constraints/tuples/TupleOf4.java
@@ -53,4 +53,3 @@ public int getSize() {
     }
 
 }
-
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ColumnRenderers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ColumnRenderers.java
index 23de941f4a5..bc05572c8e2 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ColumnRenderers.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ColumnRenderers.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.table.description.render;
 
-import java.util.SortedSet;
-
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Ordering;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.util.SortedSet;
 
 public final class ColumnRenderers {
     private ColumnRenderers() {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ImportRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ImportRenderer.java
index 81c961bcd21..2f01384ae62 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ImportRenderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/ImportRenderer.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.table.description.render;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSortedSet;
 import java.util.Collection;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSortedSet;
-
 public class ImportRenderer extends Renderer {
     private static final List<String> IMPORT_PREFIXES = ImmutableList.of("java.", "javax.", "org.", "com.", "net.");
     private final Collection<Class<?>> imports;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedColumnRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedColumnRenderer.java
index a205a7de4c4..fb2a2617c36 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedColumnRenderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedColumnRenderer.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.table.description.render;
 
-import java.util.SortedSet;
-
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
+import java.util.SortedSet;
 
 public class NamedColumnRenderer extends Renderer {
     private final String namedColumn;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedRowResultRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedRowResultRenderer.java
index 8109085db02..807e25bd6a7 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedRowResultRenderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/NamedRowResultRenderer.java
@@ -19,9 +19,8 @@
 import static com.palantir.atlasdb.table.description.render.ColumnRenderers.VarName;
 import static com.palantir.atlasdb.table.description.render.ColumnRenderers.short_name;
 
-import java.util.SortedSet;
-
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
+import java.util.SortedSet;
 
 @SuppressWarnings("checkstyle:AvoidNestedBlocks")
 class NamedRowResultRenderer extends Renderer {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderer.java
index 325537bd0fa..0c07f3d6e25 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderer.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.table.description.render;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
 import com.google.common.hash.Hashing;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.concurrent.NotThreadSafe;
 
 @NotThreadSafe
 public abstract class Renderer {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderers.java
index 547ca085679..f8d31ff2548 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderers.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/Renderers.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.table.description.render;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.palantir.atlasdb.table.description.IndexMetadata;
 import com.palantir.atlasdb.table.description.NameComponentDescription;
 import com.palantir.atlasdb.table.description.NameMetadataDescription;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.squareup.javapoet.MethodSpec;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class Renderers {
     private Renderers() {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java
index f51e4738090..ac90aad4348 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java
@@ -15,14 +15,11 @@
  */
 package com.palantir.atlasdb.table.description.render;
 
-import static java.lang.Math.max;
-
 import static com.palantir.atlasdb.table.description.render.ComponentRenderers.TypeName;
 import static com.palantir.atlasdb.table.description.render.ComponentRenderers.VarName;
 import static com.palantir.atlasdb.table.description.render.ComponentRenderers.typeName;
 import static com.palantir.atlasdb.table.description.render.ComponentRenderers.varName;
-
-import java.util.List;
+import static java.lang.Math.max;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Iterables;
@@ -32,6 +29,7 @@
 import com.palantir.atlasdb.table.description.NameMetadataDescription;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
 
 @SuppressWarnings("checkstyle:all") // too many warnings to fix
 class RowOrDynamicColumnRenderer extends Renderer {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/StreamStoreRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/StreamStoreRenderer.java
index 7a515fa7f5d..0b016d40c59 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/StreamStoreRenderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/StreamStoreRenderer.java
@@ -15,33 +15,6 @@
  */
 package com.palantir.atlasdb.table.description.render;
 
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
-import java.util.function.Supplier;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Generated;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Functions;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ArrayListMultimap;
@@ -83,6 +56,30 @@
 import com.palantir.util.crypto.Sha256Hash;
 import com.palantir.util.file.DeleteOnCloseFileInputStream;
 import com.palantir.util.file.TempFileUtils;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+import javax.annotation.CheckForNull;
+import javax.annotation.Generated;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("checkstyle:all") // too many warnings to fix
 public class StreamStoreRenderer {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableClassRendererV2.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableClassRendererV2.java
index dbcbce14179..0d3207824ef 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableClassRendererV2.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableClassRendererV2.java
@@ -23,21 +23,6 @@
 import static com.palantir.atlasdb.table.description.render.Renderers.getColumnClass;
 import static com.palantir.atlasdb.table.description.render.Renderers.getColumnClassForGenericTypeParameter;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.annotation.Generated;
-import javax.lang.model.element.Modifier;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
@@ -68,6 +53,19 @@
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Generated;
+import javax.lang.model.element.Modifier;
 
 public class TableClassRendererV2 {
     private final String packageName;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableFactoryRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableFactoryRenderer.java
index 2cb6f26207c..8cc39d6c1e1 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableFactoryRenderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableFactoryRenderer.java
@@ -17,16 +17,6 @@
 
 import static com.palantir.atlasdb.AtlasDbConstants.SCHEMA_V2_TABLE_NAME;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.SortedMap;
-import java.util.stream.Collectors;
-
-import javax.annotation.Generated;
-import javax.lang.model.element.Modifier;
-
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
@@ -45,6 +35,14 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.WildcardTypeName;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.SortedMap;
+import java.util.stream.Collectors;
+import javax.annotation.Generated;
+import javax.lang.model.element.Modifier;
 
 public final class TableFactoryRenderer {
     private final String schemaName;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java
index 0145101eea1..a11f8a91b09 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java
@@ -15,30 +15,6 @@
  */
 package com.palantir.atlasdb.table.description.render;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiFunction;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-import javax.annotation.Generated;
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
@@ -114,6 +90,28 @@
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.util.AssertUtils;
 import com.palantir.util.crypto.Sha256Hash;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import javax.annotation.Generated;
+import javax.annotation.Nullable;
 
 @SuppressWarnings("checkstyle:all") // too many warnings to fix
 public class TableRenderer {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/ColumnValues.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/ColumnValues.java
index 986865758f4..ea0fc4845e9 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/ColumnValues.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/ColumnValues.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.table.generation;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
@@ -35,6 +27,13 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.common.persist.Persistable;
 import com.palantir.common.persist.Persistable.Hydrator;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 public final class ColumnValues {
 
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/Triggers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/Triggers.java
index 5412338ddc3..fb350152e0a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/Triggers.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/generation/Triggers.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.table.generation;
 
-import java.util.List;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.transaction.api.Transaction;
+import java.util.List;
 
 public class Triggers {
     public static <T, U extends T> List<T> getAllTriggers(Transaction t,
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/tracing/CloseableTrace.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/tracing/CloseableTrace.java
index 18d8abb85d1..bf07e11625a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/tracing/CloseableTrace.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/tracing/CloseableTrace.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.tracing;
 
-import javax.annotation.Nullable;
-
-import org.slf4j.helpers.MessageFormatter;
-
 import com.google.common.collect.ObjectArrays;
 import com.palantir.tracing.Tracer;
 import com.palantir.tracing.api.OpenSpan;
 import com.palantir.tracing.api.SpanType;
+import javax.annotation.Nullable;
+import org.slf4j.helpers.MessageFormatter;
 
 public final class CloseableTrace implements AutoCloseable {
 
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java
index 981011ad894..b7ae5767927 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractConditionAwareTransactionManager.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.cache.TimestampCache;
 import com.palantir.atlasdb.transaction.api.ConditionAwareTransactionTask;
 import com.palantir.atlasdb.transaction.api.PreCommitCondition;
 import com.palantir.atlasdb.transaction.api.TransactionTask;
 import com.palantir.atlasdb.util.MetricsManager;
+import java.util.function.Supplier;
 
 public abstract class AbstractConditionAwareTransactionManager extends AbstractTransactionManager {
     private final Supplier<TransactionRetryStrategy> retryStrategy;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionManager.java
index 495553bc72a..a4e6cab3dd3 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionManager.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionManager.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.util.concurrent.RateLimiter;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.palantir.atlasdb.cache.TimestampCache;
@@ -36,6 +27,13 @@
 import com.palantir.atlasdb.transaction.api.TransactionTask;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractTransactionManager implements TransactionManager {
     private static final Logger log = LoggerFactory.getLogger(AbstractTransactionManager.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java
index 80a1f7849fd..b3e333a4ce0 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.ExecutionException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableMap;
@@ -46,6 +37,13 @@
 import com.palantir.atlasdb.transaction.service.TransactionService;
 import com.palantir.common.base.Throwables;
 import com.palantir.util.Pair;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.ExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CachingTransaction extends ForwardingTransaction {
 
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java
index 76a2fa17e73..e1d03624a5c 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.util.Map;
+import javax.annotation.Nullable;
 
 public class ConflictDetectionManager {
     private final LoadingCache<TableReference, ConflictHandler> cache;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java
index 00823e86a2a..5c24c6070b6 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.cache.CacheLoader;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class ConflictDetectionManagers {
     private static final Logger log = LoggerFactory.getLogger(ConflictDetectionManagers.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java
index 37728336b3d..a64a0f53938 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.function.BiFunction;
-import java.util.stream.Stream;
-
 import com.google.common.collect.ForwardingObject;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
@@ -38,6 +30,13 @@
 import com.palantir.atlasdb.transaction.api.TransactionReadSentinelBehavior;
 import com.palantir.atlasdb.transaction.service.TransactionService;
 import com.palantir.common.base.BatchingVisitable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
 
 public abstract class ForwardingTransaction extends ForwardingObject implements Transaction {
 
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Log4JTracingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Log4JTracingTransaction.java
index ee88a59bc80..f44b1b664e9 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Log4JTracingTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Log4JTracingTransaction.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import org.slf4j.Logger;
-
 import com.palantir.atlasdb.transaction.api.Transaction;
+import org.slf4j.Logger;
 
 public class Log4JTracingTransaction extends TracingTransaction {
     private final Logger logger;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/NoDuplicateWritesTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/NoDuplicateWritesTransaction.java
index 8ee3a54410f..183daa51ad7 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/NoDuplicateWritesTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/NoDuplicateWritesTransaction.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -35,6 +25,14 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.util.AssertUtils;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Disallows the same cell from being written twice with different values within
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ReadTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ReadTransaction.java
index 2a9fc0e137f..c04235c89d4 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ReadTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ReadTransaction.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.function.BiFunction;
-import java.util.stream.Stream;
-
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -35,6 +28,12 @@
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
 
 public class ReadTransaction extends ForwardingTransaction {
 
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManager.java
index a3d49619b88..fde83084487 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManager.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManager.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
+import java.util.Map;
 
 public class SweepStrategyManager {
     private final RecomputingSupplier<Map<TableReference, SweepStrategy>> supplier;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManagers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManagers.java
index b88db128b92..c1542384096 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManagers.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/SweepStrategyManagers.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.base.Functions;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
@@ -27,6 +24,8 @@
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
 import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.util.Map;
+import java.util.Set;
 
 public class SweepStrategyManagers {
     private SweepStrategyManagers() {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TracingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TracingTransaction.java
index 7751e9f20b4..6ca1703abea 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TracingTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TracingTransaction.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.io.BaseEncoding;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
+import java.util.Map;
+import java.util.Set;
 
 public abstract class TracingTransaction extends ForwardingTransaction {
     private final Transaction delegate;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConstants.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConstants.java
index 7a192958bc2..6b94317e1bb 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConstants.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConstants.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -24,6 +22,7 @@
 import com.palantir.atlasdb.ptobject.EncodingUtils;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.atlasdb.table.description.ValueType;
+import java.util.Set;
 
 public class TransactionConstants {
     private TransactionConstants() {/* */}
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategy.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategy.java
index 9d427e39e93..203e80dcbad 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategy.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategy.java
@@ -16,15 +16,6 @@
 
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Random;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.function.IntPredicate;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.github.rholder.retry.Attempt;
 import com.github.rholder.retry.BlockStrategies;
@@ -41,6 +32,13 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.exception.NotInitializedException;
 import com.palantir.logsafe.SafeArg;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.function.IntPredicate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class TransactionRetryStrategy {
     public enum Strategies {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Transactions.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Transactions.java
index 84f9115ce25..c7faa96400d 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Transactions.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/Transactions.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
 
 public class Transactions {
     private Transactions() { /* */ }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/UnmodifiableTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/UnmodifiableTransaction.java
index 30982c65256..757c12fd08f 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/UnmodifiableTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/UnmodifiableTransaction.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionConflictException;
+import java.util.Map;
+import java.util.Set;
 
 public class UnmodifiableTransaction extends ForwardingTransaction {
     final Transaction delegate;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AccumulatingValueMetric.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AccumulatingValueMetric.java
index 402c035fbb1..8a6dc865fa5 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AccumulatingValueMetric.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AccumulatingValueMetric.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.util;
 
-import java.util.concurrent.atomic.AtomicLong;
-
 import com.codahale.metrics.Gauge;
+import java.util.concurrent.atomic.AtomicLong;
 
 public class AccumulatingValueMetric implements Gauge<Long> {
     private final AtomicLong value = new AtomicLong(0L);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AtlasDbMetrics.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AtlasDbMetrics.java
index cab2bdda3d6..15073ef7bd7 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AtlasDbMetrics.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/AtlasDbMetrics.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.util;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.MetricRegistry;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.palantir.tritium.api.event.InstrumentationFilter;
@@ -33,6 +25,12 @@
 import com.palantir.tritium.metrics.caffeine.CaffeineCacheStats;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
 import com.palantir.tritium.proxy.Instrumentation;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class AtlasDbMetrics {
     private static final Logger log = LoggerFactory.getLogger(AtlasDbMetrics.class);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/InstrumentationUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/InstrumentationUtils.java
index fd89e1ba6e0..4b75ce3847f 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/InstrumentationUtils.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/InstrumentationUtils.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.util;
 
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BooleanSupplier;
-
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import com.codahale.metrics.Timer;
 import com.palantir.tritium.event.InstrumentationProperties;
 import com.palantir.tritium.event.InvocationContext;
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BooleanSupplier;
 
 final class InstrumentationUtils {
     static final String FAILURES_METRIC_NAME = "failures";
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/MetricNameUtils.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/MetricNameUtils.java
index ae7db247c57..ed46d3021d5 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/MetricNameUtils.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/MetricNameUtils.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.util;
 
+import com.google.common.base.Preconditions;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.google.common.base.Preconditions;
-
 public final class MetricNameUtils {
 
     private static final int MAX_ALLOWED_TAGS = 10;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMeanGauge.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMeanGauge.java
index 697e288e396..ec559c7ff25 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMeanGauge.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMeanGauge.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.util;
 
-import java.util.concurrent.TimeUnit;
-
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import com.codahale.metrics.Snapshot;
 import com.google.common.annotations.VisibleForTesting;
+import java.util.concurrent.TimeUnit;
 
 public class SlidingWindowMeanGauge implements Gauge<Double> {
     private final Histogram histogram;
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMetricsInvocationHandler.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMetricsInvocationHandler.java
index 7f364d889f1..938f7ea447b 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMetricsInvocationHandler.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMetricsInvocationHandler.java
@@ -16,17 +16,6 @@
 
 package com.palantir.atlasdb.util;
 
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import com.codahale.metrics.Timer;
@@ -35,6 +24,14 @@
 import com.palantir.tritium.event.AbstractInvocationEventHandler;
 import com.palantir.tritium.event.DefaultInvocationContext;
 import com.palantir.tritium.event.InvocationContext;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A modified version of {@link com.palantir.tritium.event.metrics.MetricsInvocationEventHandler} that uses a
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TaggedMetricsInvocationEventHandler.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TaggedMetricsInvocationEventHandler.java
index aaab9a92ae6..60af8b400d2 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TaggedMetricsInvocationEventHandler.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TaggedMetricsInvocationEventHandler.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.util;
 
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.UnsafeArg;
@@ -34,6 +23,14 @@
 import com.palantir.tritium.event.InvocationContext;
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simplified and yet extended version of Tritium's MetricsInvocationEventHandler. This class supports augmenting
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TimedOnlyInstrumentationFilter.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TimedOnlyInstrumentationFilter.java
index 05a39aab6bc..2a2f9e532a4 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TimedOnlyInstrumentationFilter.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/util/TimedOnlyInstrumentationFilter.java
@@ -16,15 +16,13 @@
 
 package com.palantir.atlasdb.util;
 
+import com.palantir.atlasdb.metrics.Timed;
+import com.palantir.tritium.api.event.InstrumentationFilter;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
 import javax.annotation.Nonnull;
 
-import com.palantir.atlasdb.metrics.Timed;
-import com.palantir.tritium.api.event.InstrumentationFilter;
-
 final class TimedOnlyInstrumentationFilter implements InstrumentationFilter {
 
     private final Map<Method, Boolean> filtered = new ConcurrentHashMap<>();
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/cache/RocksDbOffHeapTimestampCacheIntegrationTests.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/cache/RocksDbOffHeapTimestampCacheIntegrationTests.java
index db688047c63..28b0cb06279 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/cache/RocksDbOffHeapTimestampCacheIntegrationTests.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/cache/RocksDbOffHeapTimestampCacheIntegrationTests.java
@@ -18,9 +18,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
+import com.palantir.atlasdb.persistent.rocksdb.RocksDbPhysicalPersistentStore;
+import com.palantir.atlasdb.util.MetricsManagers;
 import java.io.File;
 import java.io.IOException;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -29,10 +31,6 @@
 import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
 
-import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
-import com.palantir.atlasdb.persistent.rocksdb.RocksDbPhysicalPersistentStore;
-import com.palantir.atlasdb.util.MetricsManagers;
-
 public final class RocksDbOffHeapTimestampCacheIntegrationTests {
     @ClassRule
     public static final TemporaryFolder TEMPORARY_FOLDER = new TemporaryFolder();
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/cache/RocksDbTimestampStoreTests.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/cache/RocksDbTimestampStoreTests.java
index be8aebb3b5e..ecb38f2baef 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/cache/RocksDbTimestampStoreTests.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/cache/RocksDbTimestampStoreTests.java
@@ -18,9 +18,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore.StoreNamespace;
+import com.palantir.atlasdb.persistent.rocksdb.RocksDbPhysicalPersistentStore;
 import java.io.File;
 import java.io.IOException;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -29,11 +32,6 @@
 import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore.StoreNamespace;
-import com.palantir.atlasdb.persistent.rocksdb.RocksDbPhysicalPersistentStore;
-
 public final class RocksDbTimestampStoreTests {
     @ClassRule
     public static final TemporaryFolder TEMPORARY_FOLDER = new TemporaryFolder();
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueServiceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueServiceTest.java
index f13982f5798..00b950767d8 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueServiceTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueServiceTest.java
@@ -22,10 +22,9 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.CheckAndSetCompatibility;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import org.junit.Test;
 
 public class DualWriteKeyValueServiceTest {
     private final KeyValueService delegate1 = mock(KeyValueService.class);
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitionerTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitionerTest.java
index 60aebc7e359..cd8b73c409f 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitionerTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/IterablePartitionerTest.java
@@ -15,8 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
+import com.google.common.collect.Lists;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
 import java.util.List;
-
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
@@ -25,10 +27,6 @@
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 
-import com.google.common.collect.Lists;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-
 @RunWith(Parameterized.class)
 public class IterablePartitionerTest {
 
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueServiceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueServiceTest.java
index 9433afa16d2..6ff4d217e88 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueServiceTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueServiceTest.java
@@ -25,9 +25,19 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.core.Appender;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.atlasdb.logging.KvsProfilingLogger;
 import java.util.Map;
 import java.util.function.Supplier;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -35,19 +45,6 @@
 import org.mockito.stubbing.Answer;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.api.Namespace;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.keyvalue.api.Value;
-import com.palantir.atlasdb.logging.KvsProfilingLogger;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.spi.LoggingEvent;
-import ch.qos.logback.core.Appender;
-
 /**
  * We test behaviour for every of the three maybeLog(...) methods from ProfilingKeyValueService using public facing
  * methods that use them
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueServiceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueServiceTest.java
index bdc25d6ebc3..04d83a7f092 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueServiceTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/SweepStatsKeyValueServiceTest.java
@@ -20,16 +20,14 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.nio.charset.StandardCharsets;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.timestamp.TimestampService;
+import java.nio.charset.StandardCharsets;
+import org.junit.Before;
+import org.junit.Test;
 
 public class SweepStatsKeyValueServiceTest {
     private static final byte[] ROW = "row".getBytes(StandardCharsets.UTF_8);
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueServiceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueServiceTest.java
index ac0f7180179..d35776abb41 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueServiceTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKeyValueServiceTest.java
@@ -27,18 +27,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -61,6 +49,16 @@
 import com.palantir.tracing.Tracer;
 import com.palantir.tracing.api.SpanType;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TracingKeyValueServiceTest {
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KeyValueServiceLogArbitratorTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KeyValueServiceLogArbitratorTest.java
index 51d65975fb0..aa0b68f98ad 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KeyValueServiceLogArbitratorTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KeyValueServiceLogArbitratorTest.java
@@ -17,9 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import org.junit.Test;
 
 public class KeyValueServiceLogArbitratorTest {
     private static final KeyValueServiceLogArbitrator ALL_UNSAFE = KeyValueServiceLogArbitrator.ALL_UNSAFE;
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KvsProfilingLoggerTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KvsProfilingLoggerTest.java
index 98238faffdb..72f687b9f7d 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KvsProfilingLoggerTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/KvsProfilingLoggerTest.java
@@ -22,11 +22,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import org.junit.After;
-import org.junit.Test;
-
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeArg;
+import org.junit.After;
+import org.junit.Test;
 
 public class KvsProfilingLoggerTest {
     private static final String LOG_TEMPLATE_1 = "The method {} was called.";
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/LoggingArgsTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/LoggingArgsTest.java
index edc7ce657b5..7004c62213f 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/LoggingArgsTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/LoggingArgsTest.java
@@ -19,14 +19,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-import java.util.Map;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -42,6 +34,12 @@
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.List;
+import java.util.Map;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
 
 public class LoggingArgsTest {
     private static final String ARG_NAME = "argName";
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataTest.java
index 76238f8049d..af2e2a815d5 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataTest.java
@@ -17,10 +17,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import org.junit.Test;
 
 public class SafeLoggableDataTest {
     private static final TableReference TABLE_REFERENCE_1 = TableReference.createFromFullyQualifiedName("atlas.db");
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataUtilsTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataUtilsTest.java
index 6745bdced5c..32a26e810bb 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataUtilsTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/logging/SafeLoggableDataUtilsTest.java
@@ -17,8 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
@@ -31,6 +29,7 @@
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.atlasdb.table.description.UniformRowNamePartitioner;
 import com.palantir.atlasdb.table.description.ValueType;
+import org.junit.Test;
 
 public class SafeLoggableDataUtilsTest {
     private static final TableReference TABLE_REFERENCE_1 = TableReference.createFromFullyQualifiedName("atlas.db");
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/persistent/rocksdb/RocksDbPhysicalPersistentStoreTests.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/persistent/rocksdb/RocksDbPhysicalPersistentStoreTests.java
index ff7becde37d..58b41258cc5 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/persistent/rocksdb/RocksDbPhysicalPersistentStoreTests.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/persistent/rocksdb/RocksDbPhysicalPersistentStoreTests.java
@@ -19,9 +19,15 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.persistent.api.ImmutableStoreNamespace;
+import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
+import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore.StoreNamespace;
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import java.io.File;
 import java.util.UUID;
-
+import okio.ByteString;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -29,15 +35,6 @@
 import org.junit.rules.TemporaryFolder;
 import org.rocksdb.RocksDB;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.persistent.api.ImmutableStoreNamespace;
-import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
-import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore.StoreNamespace;
-import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
-import okio.ByteString;
-
 public final class RocksDbPhysicalPersistentStoreTests {
     @ClassRule
     public static final TemporaryFolder temporaryFolder = new TemporaryFolder();
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilderTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilderTest.java
index 5c6214da40c..9c2ed389e9a 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilderTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamStoreDefinitionBuilderTest.java
@@ -16,9 +16,8 @@
 package com.palantir.atlasdb.schema.stream;
 
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.table.description.ValueType;
+import org.junit.Test;
 
 public class StreamStoreDefinitionBuilderTest {
 
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamTableTypeTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamTableTypeTest.java
index becfda81fc9..5f899038819 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamTableTypeTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/schema/stream/StreamTableTypeTest.java
@@ -20,13 +20,11 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.util.List;
-
-import org.junit.Test;
-
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.List;
+import org.junit.Test;
 
 public class StreamTableTypeTest {
 
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/BlockConsumingInputStreamTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/BlockConsumingInputStreamTest.java
index 85fd6c76d4c..7f9841db3d7 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/BlockConsumingInputStreamTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/BlockConsumingInputStreamTest.java
@@ -25,17 +25,15 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import com.palantir.atlasdb.schema.stream.StreamStoreDefinition;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import com.palantir.atlasdb.schema.stream.StreamStoreDefinition;
-
 @SuppressWarnings("ResultOfMethodCallIgnored")
 public class BlockConsumingInputStreamTest {
     private static final int DATA_SIZE = 4;
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategyTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategyTest.java
index cd87c47da75..947a875a87b 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategyTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/stream/StandardPeriodicBackoffStrategyTest.java
@@ -23,7 +23,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import java.util.concurrent.atomic.AtomicReference;
-
 import org.junit.Test;
 
 public class StandardPeriodicBackoffStrategyTest {
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/AbstractSchemaApiTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/AbstractSchemaApiTest.java
index 275ab42a7f9..5010ee77be0 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/AbstractSchemaApiTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/AbstractSchemaApiTest.java
@@ -23,16 +23,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -52,6 +42,14 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.impl.AbstractTransaction;
 import com.palantir.common.base.BatchingVisitableFromIterable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 public abstract class AbstractSchemaApiTest {
     private static final TableReference tableRef =
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ApiTestSchema.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ApiTestSchema.java
index 66c9035251a..7bcc0320cae 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ApiTestSchema.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ApiTestSchema.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.io.File;
-import java.util.stream.Stream;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.schema.AtlasSchema;
 import com.palantir.atlasdb.table.description.test.StringValuePersister;
+import java.io.File;
+import java.util.stream.Stream;
 
 /**
  * Schema used to test for Table API correctness and for accidental TableRenderer changes.
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ConflictHandlersTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ConflictHandlersTest.java
index ac0f02b2a41..02a81c1c314 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ConflictHandlersTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/ConflictHandlersTest.java
@@ -17,10 +17,9 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import org.junit.Test;
 
 public class ConflictHandlersTest {
     @Test
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/GenericTestSchema.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/GenericTestSchema.java
index db16a80cf35..a3a3ff67569 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/GenericTestSchema.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/GenericTestSchema.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.table.description;
 
-import java.io.File;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.schema.AtlasSchema;
+import java.io.File;
 
 public class GenericTestSchema implements AtlasSchema {
     public static final AtlasSchema INSTANCE = new GenericTestSchema();
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NameComponentDescriptionTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NameComponentDescriptionTest.java
index bcc82ffd48b..58e8247ce0e 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NameComponentDescriptionTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NameComponentDescriptionTest.java
@@ -17,11 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety;
+import org.junit.Test;
 
 public class NameComponentDescriptionTest {
     private static final String COMPONENT_NAME = "rowComponent";
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NamedColumnDescriptionTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NamedColumnDescriptionTest.java
index 99bbf16de1f..f9f4d546635 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NamedColumnDescriptionTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/NamedColumnDescriptionTest.java
@@ -17,10 +17,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety;
+import org.junit.Test;
 
 public class NamedColumnDescriptionTest {
     private static final String SHORT_NAME = "shortName";
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestImpl.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestImpl.java
index 9aac1184bc5..a2d9078f62c 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestImpl.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestImpl.java
@@ -17,13 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.junit.Test;
-
 import com.google.common.hash.Hashing;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
@@ -38,6 +31,11 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.common.base.BatchingVisitableView;
 import com.palantir.common.base.BatchingVisitables;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.junit.Test;
 
 public class SchemaApiTestImpl extends AbstractSchemaApiTest {
 
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestV2Impl.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestV2Impl.java
index a560660e4b6..9a909ee46b4 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestV2Impl.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaApiTestV2Impl.java
@@ -24,12 +24,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.table.description.generated.ApiTestTableFactory;
 import com.palantir.atlasdb.table.description.generated.SchemaApiTestTable;
@@ -37,6 +31,10 @@
 import com.palantir.atlasdb.table.description.test.StringValue;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.impl.AbstractTransaction;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.Test;
 
 public class SchemaApiTestV2Impl extends AbstractSchemaApiTest {
 
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaHotspottingTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaHotspottingTest.java
index b1e8934a629..f45aa5a50cc 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaHotspottingTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaHotspottingTest.java
@@ -20,16 +20,14 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
 
+import com.palantir.atlasdb.keyvalue.api.Namespace;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.palantir.atlasdb.keyvalue.api.Namespace;
-
 @SuppressWarnings({"checkstyle:Indentation", "checkstyle:RightCurly"})
 public class SchemaHotspottingTest {
     @Rule
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java
index 85dee4eaec6..d9f742f35c6 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemaTest.java
@@ -15,39 +15,34 @@
  */
 package com.palantir.atlasdb.table.description;
 
+import static com.palantir.atlasdb.AtlasDbConstants.SCHEMA_V2_TABLE_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-import static com.palantir.atlasdb.AtlasDbConstants.SCHEMA_V2_TABLE_NAME;
 
+import com.google.common.collect.Streams;
+import com.google.common.io.Files;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.google.common.collect.Streams;
-import com.google.common.io.Files;
-import com.palantir.atlasdb.AtlasDbConstants;
-import com.palantir.atlasdb.keyvalue.api.Namespace;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 public class SchemaTest {
     @Rule
     public TemporaryFolder testFolder = new TemporaryFolder();
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemasTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemasTest.java
index e78566c6975..8bb6b9b2a9f 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemasTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/SchemasTest.java
@@ -15,10 +15,16 @@
  */
 package com.palantir.atlasdb.table.description;
 
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.schema.SweepSchema;
+import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;
-
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
@@ -29,14 +35,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.api.Namespace;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.schema.SweepSchema;
-import com.palantir.atlasdb.transaction.api.ConflictHandler;
-
 @SuppressWarnings({"checkstyle:Indentation", "checkstyle:RightCurly", "checkstyle:WhitespaceAround"})
 public class SchemasTest {
     private static final String TABLE_NAME = "testTable";
@@ -144,4 +142,3 @@ private byte[] getSimpleTableDefinitionAsBytes(TableReference tableRef) {
         return getSimpleTableDefinition(tableRef).toTableMetadata().persistToBytes();
     }
 }
-
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableDefinitionTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableDefinitionTest.java
index 7f38b68d5c1..fedab6e5da0 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableDefinitionTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableDefinitionTest.java
@@ -18,12 +18,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
-
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety;
+import org.junit.Test;
 
 @SuppressWarnings("checkstyle:all") // too many warnings to fix
 public class TableDefinitionTest {
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataPersistenceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataPersistenceTest.java
index a12e84370e1..a027916467b 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataPersistenceTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataPersistenceTest.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.table.description;
 
+import com.google.common.collect.Lists;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
+import com.palantir.atlasdb.schema.stream.StreamStoreDefinitionBuilder;
+import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import java.util.Collection;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.google.common.collect.Lists;
-import com.palantir.atlasdb.AtlasDbConstants;
-import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
-import com.palantir.atlasdb.schema.stream.StreamStoreDefinitionBuilder;
-import com.palantir.atlasdb.transaction.api.ConflictHandler;
-
 @RunWith(Parameterized.class)
 @SuppressWarnings("checkstyle:all") // too many warnings to fix
 public class TableMetadataPersistenceTest {
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataTest.java
index fd2db1cb156..a5fbf6fbcdf 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/TableMetadataTest.java
@@ -17,11 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.LogSafety;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import org.junit.Test;
 
 public class TableMetadataTest {
     private static final TableMetadata DEFAULT_TABLE_METADATA = TableMetadata.allDefault();
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/render/TableRendererTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/render/TableRendererTest.java
index 93f7a510bf3..a5bca5598f0 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/render/TableRendererTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/table/description/render/TableRendererTest.java
@@ -20,17 +20,15 @@
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
 
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.table.description.IndexMetadata;
 import com.palantir.atlasdb.table.description.OptionalType;
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import org.junit.Test;
 
 public class TableRendererTest {
 
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/CloseableTraceTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/CloseableTraceTest.java
index e6d3acc0f8b..9876e6934bf 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/CloseableTraceTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/CloseableTraceTest.java
@@ -22,17 +22,15 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 
+import com.palantir.tracing.AlwaysSampler;
+import com.palantir.tracing.Tracer;
+import com.palantir.tracing.api.Span;
 import java.util.List;
 import java.util.Optional;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.tracing.AlwaysSampler;
-import com.palantir.tracing.Tracer;
-import com.palantir.tracing.api.Span;
-
 public class CloseableTraceTest {
 
     private static final String NAME = CloseableTraceTest.class.getName();
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/TestSpanObserver.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/TestSpanObserver.java
index fc4deb36238..2626e643b49 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/TestSpanObserver.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/tracing/TestSpanObserver.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.tracing;
 
+import com.palantir.tracing.api.Span;
+import com.palantir.tracing.api.SpanObserver;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.palantir.tracing.api.Span;
-import com.palantir.tracing.api.SpanObserver;
-
 public class TestSpanObserver implements SpanObserver {
     private final List<Span> spans = new ArrayList<>();
 
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ReadTransactionShould.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ReadTransactionShould.java
index 1c70a3dbeda..5953b3ea722 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ReadTransactionShould.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ReadTransactionShould.java
@@ -23,15 +23,6 @@
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -43,6 +34,13 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.common.base.Throwables;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
 
 public class ReadTransactionShould {
 
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategyTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategyTest.java
index 9dd6d86c68a..8562dfadb5b 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategyTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionRetryStrategyTest.java
@@ -20,26 +20,23 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 
+import com.github.rholder.retry.BlockStrategy;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.palantir.atlasdb.transaction.api.TransactionFailedNonRetriableException;
+import com.palantir.atlasdb.transaction.api.TransactionFailedRetriableException;
+import com.palantir.atlasdb.transaction.impl.TransactionRetryStrategy.Retryable;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.IntPredicate;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.github.rholder.retry.BlockStrategy;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.palantir.atlasdb.transaction.api.TransactionFailedNonRetriableException;
-import com.palantir.atlasdb.transaction.api.TransactionFailedRetriableException;
-import com.palantir.atlasdb.transaction.impl.TransactionRetryStrategy.Retryable;
-
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionRetryStrategyTest {
     private final TestBlockStrategy blockStrategy = new TestBlockStrategy();
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedCallableTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedCallableTest.java
index 19bed822ac5..bf663d3ac79 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedCallableTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedCallableTest.java
@@ -24,7 +24,6 @@
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedRunnableTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedRunnableTest.java
index 5e2fb321520..2bd2d3718bf 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedRunnableTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AnnotatedRunnableTest.java
@@ -21,7 +21,6 @@
 import static org.junit.Assert.fail;
 
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AtlasDbMetricsTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AtlasDbMetricsTest.java
index 2a6a5f31e48..44f75f99f70 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AtlasDbMetricsTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/AtlasDbMetricsTest.java
@@ -17,12 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.metrics.Timed;
+import java.util.function.Supplier;
+import org.junit.Test;
 
 public final class AtlasDbMetricsTest {
 
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricNameUtilsTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricNameUtilsTest.java
index 98e5dafc2e0..f11e02f6522 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricNameUtilsTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricNameUtilsTest.java
@@ -19,14 +19,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableMap;
-
 public class MetricNameUtilsTest {
     private static final String TAG_KEY_1 = "tag1";
     private static final String TAG_VALUE_1 = "tagVal1";
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricsManagerTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricsManagerTest.java
index 99ffaa017fd..6a314116332 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricsManagerTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/MetricsManagerTest.java
@@ -17,13 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.junit.After;
-import org.junit.Test;
-
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricFilter;
 import com.codahale.metrics.MetricRegistry;
@@ -31,6 +24,11 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import org.junit.After;
+import org.junit.Test;
 
 public class MetricsManagerTest {
     private static final Class<List> LIST_CLASS = List.class;
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/TimedOnlyInstrumentationFilterTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/TimedOnlyInstrumentationFilterTest.java
index 6c079a0e4fe..0f1d70818e9 100644
--- a/atlasdb-client/src/test/java/com/palantir/atlasdb/util/TimedOnlyInstrumentationFilterTest.java
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/util/TimedOnlyInstrumentationFilterTest.java
@@ -18,14 +18,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.metrics.Timed;
 import org.assertj.core.api.AbstractBooleanAssert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.palantir.atlasdb.metrics.Timed;
-
 @RunWith(MockitoJUnitRunner.class)
 public final class TimedOnlyInstrumentationFilterTest {
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/async/initializer/AsyncInitializer.java b/atlasdb-commons/src/main/java/com/palantir/async/initializer/AsyncInitializer.java
index 18e3deac6f3..267e0ca0ea2 100644
--- a/atlasdb-commons/src/main/java/com/palantir/async/initializer/AsyncInitializer.java
+++ b/atlasdb-commons/src/main/java/com/palantir/async/initializer/AsyncInitializer.java
@@ -15,20 +15,17 @@
  */
 package com.palantir.async.initializer;
 
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.exception.NotInitializedException;
+import com.palantir.logsafe.SafeArg;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.annotation.concurrent.ThreadSafe;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.exception.NotInitializedException;
-import com.palantir.logsafe.SafeArg;
-
 /**
  * Implements basic infrastructure to allow an object to be asynchronously initialized.
  * In order to be ThreadSafe, the abstract methods of the inheriting class need to be synchronized.
diff --git a/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java b/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java
index 48c7b0fa567..d6a28116204 100644
--- a/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java
+++ b/atlasdb-commons/src/main/java/com/palantir/async/initializer/Callback.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.async.initializer;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.common.base.Throwables;
+import java.util.List;
 
 /**
  * A Callback is a potentially retryable operation on a resource R. The intended use is to specify a task to be run on
diff --git a/atlasdb-commons/src/main/java/com/palantir/async/initializer/LambdaCallback.java b/atlasdb-commons/src/main/java/com/palantir/async/initializer/LambdaCallback.java
index d06c04b9d18..6cba6ccb852 100644
--- a/atlasdb-commons/src/main/java/com/palantir/async/initializer/LambdaCallback.java
+++ b/atlasdb-commons/src/main/java/com/palantir/async/initializer/LambdaCallback.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.async.initializer;
 
+import com.palantir.common.base.Throwables;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-import com.palantir.common.base.Throwables;
-
 /**
  * Convenience class for creating callbacks using lambda expressions.
  */
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/AbortingVisitors.java b/atlasdb-commons/src/main/java/com/palantir/common/base/AbortingVisitors.java
index ab10b7a2e4a..cf52d2cb06c 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/AbortingVisitors.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/AbortingVisitors.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.common.base;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.palantir.common.visitor.VisitorCheckedException;
+import java.util.Collections;
+import java.util.List;
 
 public class AbortingVisitors {
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/AbstractBatchingVisitable.java b/atlasdb-commons/src/main/java/com/palantir/common/base/AbstractBatchingVisitable.java
index 8b6489b5545..39d6a87eee3 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/AbstractBatchingVisitable.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/AbstractBatchingVisitable.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.common.base;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * This abstract class will implement the required methods in {@link BatchingVisitable}
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableFromIterable.java b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableFromIterable.java
index 3cee15567bf..108cfe99ecb 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableFromIterable.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableFromIterable.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.common.base;
 
-import java.util.Iterator;
-import java.util.List;
-
 import com.google.common.collect.Iterables;
 import com.palantir.common.collect.IterableUtils;
 import com.palantir.common.collect.IteratorUtils;
 import com.palantir.common.proxy.SingleCallProxy;
+import java.util.Iterator;
+import java.util.List;
 
 public class BatchingVisitableFromIterable<T> extends AbstractBatchingVisitable<T> {
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableView.java b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableView.java
index 903ebcc42a2..fcc73992874 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableView.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitableView.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.common.base;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -32,6 +26,10 @@
 import com.palantir.common.visitor.Visitor;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import javax.annotation.Nullable;
 
 /**
  * A wrapper for {@link BatchingVisitable} which adds support for common operations.
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitables.java b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitables.java
index 8bde086e4b8..7b3587c95ee 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitables.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/BatchingVisitables.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.common.base;
 
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Objects;
@@ -35,6 +30,9 @@
 import com.palantir.util.Mutables;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Iterator;
+import java.util.List;
+import javax.annotation.Nullable;
 
 public class BatchingVisitables {
     private BatchingVisitables() {/**/}
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterator.java b/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterator.java
index db7866626e5..d829c8faee3 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterator.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterator.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.common.base;
 
+import com.google.common.collect.Iterators;
+import com.google.common.collect.PeekingIterator;
 import java.io.Closeable;
 import java.util.Collection;
 import java.util.Iterator;
@@ -24,9 +26,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import com.google.common.collect.Iterators;
-import com.google.common.collect.PeekingIterator;
-
 public interface ClosableIterator<T> extends Iterator<T>, Closeable {
     @Override
     default void close() { }
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterators.java b/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterators.java
index cd16dc46537..1a4e192ab79 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterators.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/ClosableIterators.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.common.base;
 
+import com.google.common.collect.ImmutableSet;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Iterator;
 
-import com.google.common.collect.ImmutableSet;
-
 
 public class ClosableIterators {
     private ClosableIterators() {/* */}
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/OrderedSublistProvider.java b/atlasdb-commons/src/main/java/com/palantir/common/base/OrderedSublistProvider.java
index 44a1f0fc000..9c03d4b25ec 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/OrderedSublistProvider.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/OrderedSublistProvider.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.common.base;
 
-import java.util.List;
-
 import com.palantir.common.annotation.Inclusive;
+import java.util.List;
 
 /**
  * Provides sublists of a list of T's, where each T is identified by a long.
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/PrefetchingBatchingVisitable.java b/atlasdb-commons/src/main/java/com/palantir/common/base/PrefetchingBatchingVisitable.java
index 2dd51c1ba20..75c1b98fe67 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/PrefetchingBatchingVisitable.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/PrefetchingBatchingVisitable.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.common.base;
 
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.Queues;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ExecutorService;
@@ -24,13 +26,9 @@
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.Queues;
-
 /**
  * A {@link BatchingVisitable} that will prefetch in a background thread. If an exception happens on
  * the fetch thread, it will be thrown in batchAccept after all prefetched items have been visited.
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/base/Throwables.java b/atlasdb-commons/src/main/java/com/palantir/common/base/Throwables.java
index 1185316332f..ce5ff58b7ef 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/base/Throwables.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/base/Throwables.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.common.base;
 
+import com.palantir.common.exception.AtlasDbDependencyException;
+import com.palantir.common.exception.PalantirRuntimeException;
+import com.palantir.exception.PalantirInterruptedException;
+import com.palantir.logsafe.Preconditions;
 import java.io.InterruptedIOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -24,15 +28,9 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.common.exception.AtlasDbDependencyException;
-import com.palantir.common.exception.PalantirRuntimeException;
-import com.palantir.exception.PalantirInterruptedException;
-import com.palantir.logsafe.Preconditions;
-
 /**
  * Utilities for creating and propagating exceptions.
  *
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/EmptyQueue.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/EmptyQueue.java
index 49bbe2da509..1b736fc4202 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/collect/EmptyQueue.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/EmptyQueue.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.common.collect;
 
+import com.google.common.collect.ImmutableSet;
 import java.util.AbstractQueue;
 import java.util.Iterator;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * This queue is empty and will neither return nor accept any elements
  * @author carrino
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableUtils.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableUtils.java
index 0925562c574..9c5422337b6 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableUtils.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableUtils.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.common.collect;
 
-import java.util.AbstractCollection;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Iterables;
@@ -28,6 +22,11 @@
 import com.google.common.collect.Lists;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.Pair;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 public class IterableUtils {
     private IterableUtils() { /* */ }
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableView.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableView.java
index eea14863740..fa0ab06d424 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableView.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/IterableView.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.common.collect;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Spliterator;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
@@ -34,6 +24,14 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Spliterator;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import javax.annotation.Nullable;
 
 /**
  * A wrapper for an iterable that gives it super chaining powers. And a nice toString.
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/IteratorUtils.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/IteratorUtils.java
index 60476ad3ef2..b994a19b731 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/collect/IteratorUtils.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/IteratorUtils.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.common.collect;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.AbstractIterator;
@@ -36,6 +28,12 @@
 import com.palantir.common.visitor.Visitor;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.Pair;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.annotation.Nullable;
 
 public class IteratorUtils {
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/MapEntries.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/MapEntries.java
index f448a1e3434..7c0d3349784 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/collect/MapEntries.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/MapEntries.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.common.collect;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps.EntryTransformer;
+import java.util.Map;
+import java.util.Map.Entry;
 
 
 public class MapEntries {
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/collect/Maps2.java b/atlasdb-commons/src/main/java/com/palantir/common/collect/Maps2.java
index b07e5ae8b58..6087e6666c0 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/collect/Maps2.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/collect/Maps2.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.common.collect;
 
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Maps;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 public class Maps2 {
     private Maps2() {/* */}
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/compression/BufferedDelegateInputStream.java b/atlasdb-commons/src/main/java/com/palantir/common/compression/BufferedDelegateInputStream.java
index 162971ffe28..99f3d451ae8 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/compression/BufferedDelegateInputStream.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/compression/BufferedDelegateInputStream.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.common.compression;
 
+import com.palantir.logsafe.Preconditions;
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.palantir.logsafe.Preconditions;
-
 /**
  * {@link InputStream} that wraps a delegate InputStream, buffering reads
  * to the delegate. Allows a customized strategy for refilling the internal
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/compression/GzipCompressingInputStream.java b/atlasdb-commons/src/main/java/com/palantir/common/compression/GzipCompressingInputStream.java
index 5376a67df77..f626f683aad 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/compression/GzipCompressingInputStream.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/compression/GzipCompressingInputStream.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.common.compression;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.io.CountingInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.SequenceInputStream;
@@ -29,10 +32,6 @@
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterInputStream;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.io.CountingInputStream;
-
 
 public final class GzipCompressingInputStream {
     private static final int GZIP_MAGIC = 0x8b1f;
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/compression/LZ4CompressingInputStream.java b/atlasdb-commons/src/main/java/com/palantir/common/compression/LZ4CompressingInputStream.java
index 3c2bd0a88ff..6c12b1b9ceb 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/compression/LZ4CompressingInputStream.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/compression/LZ4CompressingInputStream.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.common.compression;
 
+import com.google.common.io.ByteStreams;
+import com.palantir.logsafe.Preconditions;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.zip.Checksum;
-
-import com.google.common.io.ByteStreams;
-import com.palantir.logsafe.Preconditions;
-
 import net.jpountz.lz4.LZ4BlockOutputStream;
 import net.jpountz.lz4.LZ4Compressor;
 import net.jpountz.lz4.LZ4Factory;
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/compression/StreamCompression.java b/atlasdb-commons/src/main/java/com/palantir/common/compression/StreamCompression.java
index feb113cecf7..5fc9f0f40b6 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/compression/StreamCompression.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/compression/StreamCompression.java
@@ -16,14 +16,12 @@
 
 package com.palantir.common.compression;
 
+import com.google.common.io.Closeables;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
-
-import com.google.common.io.Closeables;
-
 import net.jpountz.lz4.LZ4BlockInputStream;
 
 public enum StreamCompression {
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/BlockingWorkerPool.java b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/BlockingWorkerPool.java
index a4306f153c1..61aa93b1594 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/BlockingWorkerPool.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/BlockingWorkerPool.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.common.concurrent;
 
+import com.google.common.base.Throwables;
 import java.util.concurrent.CompletionService;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorCompletionService;
@@ -22,8 +23,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.google.common.base.Throwables;
-
 public class BlockingWorkerPool {
     private final CompletionService<Void> service;
     private final int concurrentTaskLimit;
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/CoalescingSupplier.java b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/CoalescingSupplier.java
index d4ab56d6a34..ef2637dd8c8 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/CoalescingSupplier.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/CoalescingSupplier.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.common.concurrent;
 
+import com.google.common.base.Throwables;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
-import com.google.common.base.Throwables;
-
 /**
  * A supplier that coalesces computation requests, such that only one computation is ever running at a time, and
  * concurrent requests will result in a single computation. Computations are guaranteed to execute after being
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/InterruptibleFuture.java b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/InterruptibleFuture.java
index f822a2050e6..8a1f9fe996b 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/InterruptibleFuture.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/InterruptibleFuture.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.common.concurrent;
 
+import com.palantir.common.base.Throwables;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
@@ -26,11 +27,8 @@
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
-
 import javax.annotation.concurrent.GuardedBy;
 
-import com.palantir.common.base.Throwables;
-
 /**
  * A {@link RunnableFuture} whose {@code get} methods will never throw
  * {@link CancellationException} <em>unless</em> the task was never run. If
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/MultiplexingCompletionService.java b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/MultiplexingCompletionService.java
index b66c98536d8..e12409adf01 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/concurrent/MultiplexingCompletionService.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/concurrent/MultiplexingCompletionService.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.common.concurrent;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
@@ -25,10 +28,6 @@
 import java.util.concurrent.RunnableFuture;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 /**
  * A MultiplexingCompletionService is much like a {@link java.util.concurrent.ExecutorCompletionService}, but
  * supports multiple delegate {@link ExecutorService}s feeding in to a single shared {@link BlockingQueue}.
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/io/ConcatenatedInputStream.java b/atlasdb-commons/src/main/java/com/palantir/common/io/ConcatenatedInputStream.java
index 4ebee5d6ba5..bdea0952da0 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/io/ConcatenatedInputStream.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/io/ConcatenatedInputStream.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.common.io;
 
+import com.google.common.collect.Queues;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Queue;
 
-import com.google.common.collect.Queues;
-
 public class ConcatenatedInputStream extends InputStream {
     private final Queue<InputStream> streams;
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/persist/Persistables.java b/atlasdb-commons/src/main/java/com/palantir/common/persist/Persistables.java
index 293de7c81ce..ecdf3bd0937 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/persist/Persistables.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/persist/Persistables.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.common.persist;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.List;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import com.palantir.common.annotation.Output;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.persist.Persistable.Hydrator;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.List;
 
 public class Persistables {
     @SuppressWarnings("unchecked")
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/pooling/AbstractPoolingContainer.java b/atlasdb-commons/src/main/java/com/palantir/common/pooling/AbstractPoolingContainer.java
index 3cd5c977114..5abf124aa53 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/pooling/AbstractPoolingContainer.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/pooling/AbstractPoolingContainer.java
@@ -15,21 +15,18 @@
  */
 package com.palantir.common.pooling;
 
+import com.google.common.base.Function;
+import com.palantir.common.base.FunctionCheckedException;
+import com.palantir.common.collect.EmptyQueue;
+import com.palantir.logsafe.Preconditions;
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicLong;
-
 import javax.annotation.Nonnull;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Function;
-import com.palantir.common.base.FunctionCheckedException;
-import com.palantir.common.collect.EmptyQueue;
-import com.palantir.logsafe.Preconditions;
-
 
 /**
  * This class will pool resources up to the passedLimit.  It will never block and instead will always allocate a new
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java
index 6f109e9a0b0..c2fb003c6b9 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/DelayProxy.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.common.proxy;
 
+import com.google.common.base.Suppliers;
+import com.palantir.common.base.Throwables;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.function.Supplier;
 
-import com.google.common.base.Suppliers;
-import com.palantir.common.base.Throwables;
-
 public class DelayProxy implements DelegatingInvocationHandler {
 
     @SuppressWarnings("unchecked")
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/ExperimentRunningProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/ExperimentRunningProxy.java
index 22fd672cdc3..f087327f4fe 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/ExperimentRunningProxy.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/ExperimentRunningProxy.java
@@ -16,6 +16,11 @@
 
 package com.palantir.common.proxy;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Suppliers;
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.palantir.exception.NotInitializedException;
+import com.palantir.logsafe.SafeArg;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -26,16 +31,9 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Suppliers;
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.palantir.exception.NotInitializedException;
-import com.palantir.logsafe.SafeArg;
-
 public final class ExperimentRunningProxy<T> extends AbstractInvocationHandler {
     private static final Logger log = LoggerFactory.getLogger(ExperimentRunningProxy.class);
     static final Duration REFRESH_INTERVAL = Duration.ofMinutes(10);
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/InterruptibleProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/InterruptibleProxy.java
index c5a43769ec2..23070c77156 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/InterruptibleProxy.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/InterruptibleProxy.java
@@ -15,6 +15,11 @@
  */
 package com.palantir.common.proxy;
 
+import com.google.common.base.Suppliers;
+import com.palantir.common.base.Throwables;
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.exception.PalantirInterruptedException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -23,12 +28,6 @@
 import java.util.concurrent.Future;
 import java.util.function.Supplier;
 
-import com.google.common.base.Suppliers;
-import com.palantir.common.base.Throwables;
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.exception.PalantirInterruptedException;
-
 /**
  * Proxy that calls the requested method in another thread waits on a Future.
  * If the calling thread is interrupted, this proxy will throw a PalantirInterruptedException.
@@ -89,4 +88,3 @@ public Object getDelegate() {
         return delegate;
     }
 }
-
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java
index d2ce19729b2..2a08c115fac 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/MultiDelegateProxy.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.common.proxy;
 
+import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableList;
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.palantir.logsafe.Preconditions;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.palantir.logsafe.Preconditions;
-
 /**
  * This class will delegate functionality and return the value (or throw the exception) of
  * one of the delegates.
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/PredicateSwitchedProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/PredicateSwitchedProxy.java
index a7f7805689b..bf22cf6b79d 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/PredicateSwitchedProxy.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/PredicateSwitchedProxy.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.common.proxy;
 
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.palantir.exception.NotInitializedException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.palantir.exception.NotInitializedException;
-
 public final class PredicateSwitchedProxy<T> extends AbstractInvocationHandler {
     private final T firstService;
     private final T secondService;
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingProxy.java
index aceb97201a8..4c2014d9df8 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingProxy.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingProxy.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.common.proxy;
 
+import com.palantir.logsafe.Preconditions;
+import com.palantir.util.ObjectInputStreamFactory;
 import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import com.palantir.logsafe.Preconditions;
-import com.palantir.util.ObjectInputStreamFactory;
-
 public class SerializingProxy implements DelegatingInvocationHandler {
 
     public static <T> T newProxyInstance(Class<T> interfaceClass, T delegate) {
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingUtils.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingUtils.java
index 982071f5c0c..0d596d613c8 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingUtils.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SerializingUtils.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.common.proxy;
 
+import com.palantir.util.ByteArrayIOStream;
+import com.palantir.util.ObjectInputStreamFactory;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.util.ByteArrayIOStream;
-import com.palantir.util.ObjectInputStreamFactory;
-
 public class SerializingUtils {
     protected static final Logger log = LoggerFactory.getLogger(SerializingUtils.class);
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SingleCallProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SingleCallProxy.java
index 99a46d8a14d..bb6bcde9e97 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/SingleCallProxy.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/SingleCallProxy.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.common.proxy;
 
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 /**
  * Ensure that only a single method is ever called.  Throw {@link IllegalStateException} on all subsequent calls.
  */
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/TimingProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/TimingProxy.java
index 6723512f0f2..e7cedc13c72 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/proxy/TimingProxy.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/proxy/TimingProxy.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.common.proxy;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.jmx.OperationTimer;
 import com.palantir.util.jmx.OperationTimer.TimingState;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 
 public class TimingProxy implements DelegatingInvocationHandler {
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/random/SecureRandomPool.java b/atlasdb-commons/src/main/java/com/palantir/common/random/SecureRandomPool.java
index 988a8f42897..cd645bd6222 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/random/SecureRandomPool.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/random/SecureRandomPool.java
@@ -16,17 +16,15 @@
 package com.palantir.common.random;
 
 
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
 public class SecureRandomPool {
     private static final Logger log = LoggerFactory.getLogger(SecureRandomPool.class);
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/remoting/HeaderAccessUtils.java b/atlasdb-commons/src/main/java/com/palantir/common/remoting/HeaderAccessUtils.java
index 28707ecf23b..6ea6431623b 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/remoting/HeaderAccessUtils.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/remoting/HeaderAccessUtils.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.common.remoting;
 
+import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.Map;
 
-import com.google.common.collect.ImmutableList;
-
 /**
  * This class is useful for accessing HTTP headers in a case-insensitive manner.
  * This is necessary for compatibility with OkHttp 3.3.0+, as that lower-cases header names whereas we use constants
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/remoting/ServiceNotAvailableException.java b/atlasdb-commons/src/main/java/com/palantir/common/remoting/ServiceNotAvailableException.java
index 60966902334..c6c268d8ee9 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/remoting/ServiceNotAvailableException.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/remoting/ServiceNotAvailableException.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.common.remoting;
 
-import java.util.Optional;
-
 import com.google.common.net.HostAndPort;
+import java.util.Optional;
 
 /**
  * If a server is shutting down or cannot respond to a call for another reson this exception may be thrown.
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/time/NanoTime.java b/atlasdb-commons/src/main/java/com/palantir/common/time/NanoTime.java
index e0deb380c8b..d97b21e02d6 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/time/NanoTime.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/time/NanoTime.java
@@ -16,14 +16,12 @@
 
 package com.palantir.common.time;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.time.Duration;
 import java.util.concurrent.locks.LockSupport;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
 public abstract class NanoTime implements Comparable<NanoTime> {
diff --git a/atlasdb-commons/src/main/java/com/palantir/exception/PalantirInterruptedException.java b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirInterruptedException.java
index 92629410bbf..e23afef3db2 100644
--- a/atlasdb-commons/src/main/java/com/palantir/exception/PalantirInterruptedException.java
+++ b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirInterruptedException.java
@@ -42,4 +42,3 @@ public PalantirInterruptedException(String msg, Throwable n) {
         super(msg, n);
     }
 }
-
diff --git a/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java
index 3aba04ea74b..8a8d7f22152 100644
--- a/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java
+++ b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.exception;
 
+import com.palantir.common.exception.PalantirRuntimeException;
 import java.sql.SQLException;
 import java.util.Optional;
 
-import com.palantir.common.exception.PalantirRuntimeException;
-
 /**
  * SQLExceptions are checked. However, generally speaking, we just want to propagate them.
  * Having a whole bunch of 'throws' and 'catch throws' is ugly & unnecessary.
@@ -85,4 +84,3 @@ public static PalantirSqlException createForChaining(String msg) {
         return new PalantirSqlException(DO_NOT_SET_INITIAL_SQL_EXCEPTION.YES, msg);
     }
 }
-
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/AggregatingVersionedSupplier.java b/atlasdb-commons/src/main/java/com/palantir/util/AggregatingVersionedSupplier.java
index 4768d65d9e2..6eddd87cba6 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/AggregatingVersionedSupplier.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/AggregatingVersionedSupplier.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.util;
 
+import com.google.common.base.Suppliers;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.concurrent.ConcurrentHashMap;
@@ -23,8 +24,6 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import com.google.common.base.Suppliers;
-
 public class AggregatingVersionedSupplier<T> implements Supplier<VersionedType<T>> {
     public static final long UNINITIALIZED_VERSION = 0L;
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/AssertUtils.java b/atlasdb-commons/src/main/java/com/palantir/util/AssertUtils.java
index 81d4a14c8f6..9341bf56c0f 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/AssertUtils.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/AssertUtils.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.util;
 
+import com.google.common.collect.Sets;
+import com.palantir.logsafe.exceptions.SafeRuntimeException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Sets;
-import com.palantir.logsafe.exceptions.SafeRuntimeException;
-
 public class AssertUtils {
 
     /**
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/CachedComposedSupplier.java b/atlasdb-commons/src/main/java/com/palantir/util/CachedComposedSupplier.java
index 12637a206e9..865bca6b241 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/CachedComposedSupplier.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/CachedComposedSupplier.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.util;
 
+import com.palantir.common.time.Clock;
+import com.palantir.common.time.SystemClock;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import com.palantir.common.time.Clock;
-import com.palantir.common.time.SystemClock;
-
 /**
  * A version of composed supplier that caches the result of applying the function to the value supplied by the
  * underlying supplier of {@link VersionedType}. The result is recomputed if and only if the returned version
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/JMXUtils.java b/atlasdb-commons/src/main/java/com/palantir/util/JMXUtils.java
index 45cfca58545..1cff2bc65f1 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/JMXUtils.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/JMXUtils.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.util;
 
+import com.google.common.collect.Collections2;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.ref.ReferenceQueue;
@@ -26,7 +28,6 @@
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.server.RMISocketFactory;
-
 import javax.management.Attribute;
 import javax.management.AttributeList;
 import javax.management.AttributeNotFoundException;
@@ -47,13 +48,9 @@
 import javax.management.remote.JMXConnectorServer;
 import javax.management.remote.JMXConnectorServerFactory;
 import javax.management.remote.JMXServiceURL;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Collections2;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 /**
  */
 public final class JMXUtils {
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/MutuallyExclusiveSetLock.java b/atlasdb-commons/src/main/java/com/palantir/util/MutuallyExclusiveSetLock.java
index ae46357b0d3..7968bafffff 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/MutuallyExclusiveSetLock.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/MutuallyExclusiveSetLock.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.util;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.concurrent.locks.ReentrantLock;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -34,6 +24,15 @@
 import com.google.common.collect.Sets;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.concurrent.locks.ReentrantLock;
 
 
 /**
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/OptionalResolver.java b/atlasdb-commons/src/main/java/com/palantir/util/OptionalResolver.java
index 9ddbe811aa2..bc334e37a3a 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/OptionalResolver.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/OptionalResolver.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.util;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-
 public final class OptionalResolver {
     private OptionalResolver() {
         // Utility class
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/Pair.java b/atlasdb-commons/src/main/java/com/palantir/util/Pair.java
index 7843bf808fc..603491ec9da 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/Pair.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/Pair.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.util;
 
-import java.io.Serializable;
-import java.util.Comparator;
-
-import javax.annotation.concurrent.Immutable;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Ordering;
 import com.palantir.common.annotation.LongTermSerialized;
+import java.io.Serializable;
+import java.util.Comparator;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A generic class for handling pairs of things.
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/PersistableBoolean.java b/atlasdb-commons/src/main/java/com/palantir/util/PersistableBoolean.java
index 24a9e554dfe..b2b984282b8 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/PersistableBoolean.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/PersistableBoolean.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.util;
 
-import java.util.Arrays;
-
 import com.palantir.common.persist.Persistable;
+import java.util.Arrays;
 
 public enum PersistableBoolean implements Persistable {
     TRUE {
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/SoftCache.java b/atlasdb-commons/src/main/java/com/palantir/util/SoftCache.java
index e0583e735bf..101b37bc385 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/SoftCache.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/SoftCache.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.util;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
@@ -28,14 +31,9 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
 /**
  * Thread Safe
  *
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/VersionedType.java b/atlasdb-commons/src/main/java/com/palantir/util/VersionedType.java
index 8fd2f8ed599..f160f17771e 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/VersionedType.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/VersionedType.java
@@ -16,7 +16,6 @@
 package com.palantir.util;
 
 import javax.annotation.Nullable;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/crypto/Sha256Hash.java b/atlasdb-commons/src/main/java/com/palantir/util/crypto/Sha256Hash.java
index 58554c524fb..1ca6afd01e8 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/crypto/Sha256Hash.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/crypto/Sha256Hash.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.util.crypto;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-
 import com.google.common.hash.HashCode;
 import com.google.common.hash.Hasher;
 import com.google.common.io.BaseEncoding;
@@ -30,6 +22,13 @@
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 
 /**
  * A SHA-256 hash. This class provides type-safety and equals/hashCode
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/debug/StackTraceUtils.java b/atlasdb-commons/src/main/java/com/palantir/util/debug/StackTraceUtils.java
index 7592b09a2e2..f848877fba7 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/debug/StackTraceUtils.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/debug/StackTraceUtils.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.util.debug;
 
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.management.ManagementFactory;
@@ -32,14 +33,11 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.management.JMException;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.openmbean.CompositeData;
 
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 @SuppressWarnings("checkstyle")
 // WARNING: This class was copied verbatim from an internal product. We are aware that the code quality is not great
 // and we lack tests, however this is covered by testing in the internal product
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/debug/ThreadDumps.java b/atlasdb-commons/src/main/java/com/palantir/util/debug/ThreadDumps.java
index 5fa9181c909..cb00a95b429 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/debug/ThreadDumps.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/debug/ThreadDumps.java
@@ -19,7 +19,6 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
-
 import javax.management.JMException;
 
 @SuppressWarnings("checkstyle")
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/file/DeleteOnCloseFileInputStream.java b/atlasdb-commons/src/main/java/com/palantir/util/file/DeleteOnCloseFileInputStream.java
index 99e60a33351..6afb048b60f 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/file/DeleteOnCloseFileInputStream.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/file/DeleteOnCloseFileInputStream.java
@@ -19,7 +19,6 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/file/TempFileUtils.java b/atlasdb-commons/src/main/java/com/palantir/util/file/TempFileUtils.java
index d803cb8f6ea..295be76d60c 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/file/TempFileUtils.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/file/TempFileUtils.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.util.file;
 
+import com.google.common.io.BaseEncoding;
+import com.palantir.logsafe.exceptions.SafeIoException;
 import java.io.File;
 import java.io.IOException;
 import java.util.Random;
 
-import com.google.common.io.BaseEncoding;
-import com.palantir.logsafe.exceptions.SafeIoException;
-
 public final class TempFileUtils {
     private TempFileUtils() {/**/
     }
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/paging/AbstractPagingIterable.java b/atlasdb-commons/src/main/java/com/palantir/util/paging/AbstractPagingIterable.java
index 1a88aa780e3..46a841904e4 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/paging/AbstractPagingIterable.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/paging/AbstractPagingIterable.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.util.paging;
 
-import java.util.Iterator;
-
 import com.google.common.collect.AbstractIterator;
 import com.palantir.common.base.Throwables;
 import com.palantir.logsafe.Preconditions;
+import java.util.Iterator;
 
 /**
  * This class only requires two methods {@link #getFirstPage()} and
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/paging/PageDrainer.java b/atlasdb-commons/src/main/java/com/palantir/util/paging/PageDrainer.java
index 59658431be3..4dfd6b9ec1b 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/paging/PageDrainer.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/paging/PageDrainer.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.util.paging;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import java.util.List;
 
 public class PageDrainer<T> {
     private final PageGetter<T> pageGetter;
@@ -43,4 +42,3 @@ private boolean hasNextPage(List<T> currentPage) {
         return currentPage.size() >= pageGetter.getPageSize();
     }
 }
-
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/paging/SimpleResultsPage.java b/atlasdb-commons/src/main/java/com/palantir/util/paging/SimpleResultsPage.java
index fea1417b1b4..3adebeca885 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/paging/SimpleResultsPage.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/paging/SimpleResultsPage.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.util.paging;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 import java.io.Serializable;
 import java.util.Collections;
-
 import javax.annotation.concurrent.Immutable;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-
 /**
  *
  * Supplies a simple result page.
diff --git a/atlasdb-commons/src/main/java/com/palantir/util/timer/LoggingOperationTimer.java b/atlasdb-commons/src/main/java/com/palantir/util/timer/LoggingOperationTimer.java
index dc7f881ea97..9a28805a90b 100644
--- a/atlasdb-commons/src/main/java/com/palantir/util/timer/LoggingOperationTimer.java
+++ b/atlasdb-commons/src/main/java/com/palantir/util/timer/LoggingOperationTimer.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.util.timer;
 
+import com.palantir.util.jmx.OperationTimer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.util.jmx.OperationTimer;
-
 public class LoggingOperationTimer implements OperationTimer {
     private final Logger delegate;
 
diff --git a/atlasdb-commons/src/test/java/com/palantir/async/initializer/AsyncInitializerTest.java b/atlasdb-commons/src/test/java/com/palantir/async/initializer/AsyncInitializerTest.java
index 890e49f6326..bb781f221aa 100644
--- a/atlasdb-commons/src/test/java/com/palantir/async/initializer/AsyncInitializerTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/async/initializer/AsyncInitializerTest.java
@@ -27,7 +27,6 @@
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Test;
 import org.mockito.Mockito;
diff --git a/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallChainTest.java b/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallChainTest.java
index f9e9f8c6f1e..7a81b843dd2 100644
--- a/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallChainTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallChainTest.java
@@ -20,21 +20,19 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
-
 import org.immutables.value.Value;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
 public class CallChainTest {
     private static final String TEST_STRING = "abc";
 
diff --git a/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallbackTest.java b/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallbackTest.java
index 8c5206522d6..3edaf0342a9 100644
--- a/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallbackTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/async/initializer/CallbackTest.java
@@ -19,15 +19,13 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 
+import com.palantir.common.concurrent.PTExecutors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.awaitility.Awaitility;
 import org.junit.Test;
 
-import com.palantir.common.concurrent.PTExecutors;
-
 public class CallbackTest {
     @Test
     public void runWithRetryStopsRetryingOnSuccess() {
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/base/BatchingVisitablesTest.java b/atlasdb-commons/src/test/java/com/palantir/common/base/BatchingVisitablesTest.java
index eb5612dd5af..c5a8ac1f094 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/base/BatchingVisitablesTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/base/BatchingVisitablesTest.java
@@ -24,12 +24,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.junit.Test;
-
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Preconditions;
@@ -44,6 +38,9 @@
 import com.palantir.util.Mutables;
 import com.palantir.util.Pair;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.junit.Test;
 
 @SuppressWarnings("Guava") // BatchingVisitables uses Guava.
 public class BatchingVisitablesTest {
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/base/ThrowablesTest.java b/atlasdb-commons/src/test/java/com/palantir/common/base/ThrowablesTest.java
index 1ac791bb382..403e1d582ff 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/base/ThrowablesTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/base/ThrowablesTest.java
@@ -21,7 +21,6 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/collect/IterableViewTest.java b/atlasdb-commons/src/test/java/com/palantir/common/collect/IterableViewTest.java
index 7387887dd17..b639fcadab2 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/collect/IterableViewTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/collect/IterableViewTest.java
@@ -18,16 +18,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-import java.util.Spliterator;
-import java.util.stream.StreamSupport;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Iterables;
+import java.util.List;
+import java.util.Spliterator;
+import java.util.stream.StreamSupport;
+import org.junit.Test;
 
 public class IterableViewTest {
 
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/compression/StreamCompressionTests.java b/atlasdb-commons/src/test/java/com/palantir/common/compression/StreamCompressionTests.java
index 09e79977074..05bba090187 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/compression/StreamCompressionTests.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/compression/StreamCompressionTests.java
@@ -19,19 +19,17 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
+import com.google.common.io.ByteStreams;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Random;
-
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.google.common.io.ByteStreams;
-
 @RunWith(Parameterized.class)
 public class StreamCompressionTests {
     private static final StreamCompression GZIP = StreamCompression.GZIP;
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java
index df80fa0f831..9047f9025cf 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/CoalescingSupplierTest.java
@@ -26,6 +26,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -35,12 +36,9 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.util.concurrent.Uninterruptibles;
-
 public class CoalescingSupplierTest {
     private static final int DEFAULT_VALUE = 123;
 
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/InterruptibleFutureTest.java b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/InterruptibleFutureTest.java
index a4265dbcd0d..dc0ca998965 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/InterruptibleFutureTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/InterruptibleFutureTest.java
@@ -26,7 +26,6 @@
 import java.util.concurrent.RunnableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/MultiplexingCompletionServiceTest.java b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/MultiplexingCompletionServiceTest.java
index 74e581da230..8dbced24d7f 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/concurrent/MultiplexingCompletionServiceTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/concurrent/MultiplexingCompletionServiceTest.java
@@ -18,6 +18,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -26,14 +28,10 @@
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-
 public class MultiplexingCompletionServiceTest {
     private static final String KEY_1 = "key_1";
     private static final String KEY_2 = "key_2";
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/proxy/ExperimentRunningProxyTest.java b/atlasdb-commons/src/test/java/com/palantir/common/proxy/ExperimentRunningProxyTest.java
index 9d7a296468d..705ef74acbe 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/proxy/ExperimentRunningProxyTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/proxy/ExperimentRunningProxyTest.java
@@ -29,7 +29,6 @@
 import java.util.function.BooleanSupplier;
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/proxy/InterruptibleProxyTest.java b/atlasdb-commons/src/test/java/com/palantir/common/proxy/InterruptibleProxyTest.java
index a98e144fe3f..263f1faaf5a 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/proxy/InterruptibleProxyTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/proxy/InterruptibleProxyTest.java
@@ -20,17 +20,15 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.palantir.common.exception.PalantirRuntimeException;
+import com.palantir.exception.PalantirInterruptedException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.junit.Test;
 
-import com.palantir.common.exception.PalantirRuntimeException;
-import com.palantir.exception.PalantirInterruptedException;
-
 public class InterruptibleProxyTest {
 
     @Test
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/proxy/PredicateSwitchedProxyTest.java b/atlasdb-commons/src/test/java/com/palantir/common/proxy/PredicateSwitchedProxyTest.java
index b0e67267873..316af5c32db 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/proxy/PredicateSwitchedProxyTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/proxy/PredicateSwitchedProxyTest.java
@@ -22,7 +22,6 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.IntConsumer;
-
 import org.junit.Test;
 
 public class PredicateSwitchedProxyTest {
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/time/NanoTimeTests.java b/atlasdb-commons/src/test/java/com/palantir/common/time/NanoTimeTests.java
index 9e103ccce84..896e3f41f96 100644
--- a/atlasdb-commons/src/test/java/com/palantir/common/time/NanoTimeTests.java
+++ b/atlasdb-commons/src/test/java/com/palantir/common/time/NanoTimeTests.java
@@ -18,9 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
 
 public final class NanoTimeTests {
 
@@ -50,4 +49,3 @@ public void canBeSerializedAndDeserialized() throws Exception {
         assertThat(deserialized).isEqualTo(nanoTime);
     }
 }
-
diff --git a/atlasdb-commons/src/test/java/com/palantir/remoting/HeaderAccessUtilsTest.java b/atlasdb-commons/src/test/java/com/palantir/remoting/HeaderAccessUtilsTest.java
index 65bedc4cc32..76e4dd81303 100644
--- a/atlasdb-commons/src/test/java/com/palantir/remoting/HeaderAccessUtilsTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/remoting/HeaderAccessUtilsTest.java
@@ -19,15 +19,13 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collection;
-import java.util.Map;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.palantir.common.remoting.HeaderAccessUtils;
+import java.util.Collection;
+import java.util.Map;
+import org.junit.Test;
 
 public class HeaderAccessUtilsTest {
     private static final String FOO = "foo";
diff --git a/atlasdb-commons/src/test/java/com/palantir/util/AggregatingVersionedSupplierTest.java b/atlasdb-commons/src/test/java/com/palantir/util/AggregatingVersionedSupplierTest.java
index 7610c38a05d..25378de13ab 100644
--- a/atlasdb-commons/src/test/java/com/palantir/util/AggregatingVersionedSupplierTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/util/AggregatingVersionedSupplierTest.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.util;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import static com.palantir.util.AggregatingVersionedSupplier.UNINITIALIZED_VERSION;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Comparator;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/atlasdb-commons/src/test/java/com/palantir/util/AllAtlasCommonsTests.java b/atlasdb-commons/src/test/java/com/palantir/util/AllAtlasCommonsTests.java
index d49995f37a3..bc92b4c2148 100644
--- a/atlasdb-commons/src/test/java/com/palantir/util/AllAtlasCommonsTests.java
+++ b/atlasdb-commons/src/test/java/com/palantir/util/AllAtlasCommonsTests.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.util;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
 import com.palantir.common.base.ThrowablesTest;
 import com.palantir.util.crypto.Sha256HashTest;
 import com.palantir.util.paging.PageDrainerTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
 @SuiteClasses({
diff --git a/atlasdb-commons/src/test/java/com/palantir/util/CachedComposedSupplierTest.java b/atlasdb-commons/src/test/java/com/palantir/util/CachedComposedSupplierTest.java
index ccf796d811a..dd96c78f68b 100644
--- a/atlasdb-commons/src/test/java/com/palantir/util/CachedComposedSupplierTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/util/CachedComposedSupplierTest.java
@@ -18,18 +18,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.palantir.common.concurrent.PTExecutors;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import com.palantir.common.concurrent.PTExecutors;
-
 public class CachedComposedSupplierTest {
     private long counter;
     private long supplierCounter;
diff --git a/atlasdb-commons/src/test/java/com/palantir/util/CachedTransformingSupplierTest.java b/atlasdb-commons/src/test/java/com/palantir/util/CachedTransformingSupplierTest.java
index 0c379f047f4..48bc2b78d1e 100644
--- a/atlasdb-commons/src/test/java/com/palantir/util/CachedTransformingSupplierTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/util/CachedTransformingSupplierTest.java
@@ -27,7 +27,6 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.IntStream;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/atlasdb-commons/src/test/java/com/palantir/util/MutuallyExclusiveSetLockTest.java b/atlasdb-commons/src/test/java/com/palantir/util/MutuallyExclusiveSetLockTest.java
index d9d5d75e1c6..380668aa8cd 100644
--- a/atlasdb-commons/src/test/java/com/palantir/util/MutuallyExclusiveSetLockTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/util/MutuallyExclusiveSetLockTest.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.util;
 
+import com.palantir.util.MutuallyExclusiveSetLock.LockState;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.util.MutuallyExclusiveSetLock.LockState;
-
 public class MutuallyExclusiveSetLockTest {
     /** True iff test threads should release all their resources. */
     volatile boolean unlock;
diff --git a/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java b/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java
index 91a6a466e9c..ff2444fb37a 100644
--- a/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java
@@ -19,7 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Optional;
-
 import org.junit.Test;
 
 public class OptionalResolverTest {
diff --git a/atlasdb-commons/src/test/java/com/palantir/util/crypto/Sha256HashTest.java b/atlasdb-commons/src/test/java/com/palantir/util/crypto/Sha256HashTest.java
index 37c6a2656e7..c68b7dda1ca 100644
--- a/atlasdb-commons/src/test/java/com/palantir/util/crypto/Sha256HashTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/util/crypto/Sha256HashTest.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.util.crypto;
 
+import com.google.common.base.Charsets;
+import com.google.common.io.BaseEncoding;
 import java.security.MessageDigest;
-
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.BaseEncoding;
-
 public class Sha256HashTest {
 
     @Test
diff --git a/atlasdb-commons/src/test/java/com/palantir/util/paging/PageDrainerTest.java b/atlasdb-commons/src/test/java/com/palantir/util/paging/PageDrainerTest.java
index 125ca23332c..f1192a8eacc 100644
--- a/atlasdb-commons/src/test/java/com/palantir/util/paging/PageDrainerTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/util/paging/PageDrainerTest.java
@@ -16,16 +16,13 @@
 package com.palantir.util.paging;
 
 import static java.lang.Math.min;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 
-import java.util.List;
-
-import org.junit.Test;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import java.util.List;
+import org.junit.Test;
 
 public class PageDrainerTest {
     private static final int PAGE_SIZE = 10;
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java
index 8cb81eeb7b9..7320527def3 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfig.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.config;
 
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -36,6 +28,11 @@
 import com.palantir.atlasdb.sweep.queue.config.TargetedSweepInstallConfig;
 import com.palantir.exception.NotInitializedException;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @JsonDeserialize(as = ImmutableAtlasDbConfig.class)
 @JsonSerialize(as = ImmutableAtlasDbConfig.class)
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java
index 1642eb42053..f7cf7dd22ff 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.config;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Optional;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
-
 import com.fasterxml.jackson.core.JsonPointer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,6 +27,12 @@
 import com.palantir.config.crypto.jackson.JsonNodeStringReplacer;
 import com.palantir.config.crypto.jackson.JsonNodeVisitors;
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Optional;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 
 public final class AtlasDbConfigs {
     public static final String ATLASDB_CONFIG_OBJECT_PATH = "/atlasdb";
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java
index 5fff51f0203..122ef306479 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.config;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -30,6 +26,8 @@
 import com.palantir.atlasdb.sweep.queue.config.TargetedSweepRuntimeConfig;
 import com.palantir.atlasdb.transaction.ImmutableTransactionConfig;
 import com.palantir.atlasdb.transaction.TransactionConfig;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableAtlasDbRuntimeConfig.class)
 @JsonSerialize(as = ImmutableAtlasDbRuntimeConfig.class)
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/DiscoverableSubtypeResolver.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/DiscoverableSubtypeResolver.java
index 55e296ebc61..9ab80d30d83 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/DiscoverableSubtypeResolver.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/DiscoverableSubtypeResolver.java
@@ -16,6 +16,8 @@
 */
 package com.palantir.atlasdb.config;
 
+import com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver;
+import com.google.common.collect.ImmutableList;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,13 +27,9 @@
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver;
-import com.google.common.collect.ImmutableList;
-
 /**
  * A Jackson subtype resolver which discovers subtypes via the META-INF/services directory
  *  used by the {@link java.util.ServiceLoader}.
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/PersistentStorageConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/PersistentStorageConfig.java
index b045c4db650..6afd5a3497e 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/PersistentStorageConfig.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/PersistentStorageConfig.java
@@ -16,15 +16,13 @@
 
 package com.palantir.atlasdb.config;
 
-import java.io.File;
-import java.nio.file.Paths;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.io.File;
+import java.nio.file.Paths;
+import org.immutables.value.Value;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/RocksDbPersistentStorageConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/RocksDbPersistentStorageConfig.java
index b9f7a0ede7f..2b5bd9ecbed 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/RocksDbPersistentStorageConfig.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/RocksDbPersistentStorageConfig.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableRocksDbPersistentStorageConfig.class)
 @JsonSerialize(as = ImmutableRocksDbPersistentStorageConfig.class)
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/SweepConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/SweepConfig.java
index e7015bc636e..fb5583b4a3f 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/SweepConfig.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/SweepConfig.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.config;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.sweep.priority.SweepPriorityOverrideConfig;
 import com.palantir.logsafe.Preconditions;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableSweepConfig.class)
 @JsonSerialize(as = ImmutableSweepConfig.class)
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfig.java
index 0da61f5abc4..8db090519e9 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfig.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfig.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.config;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableTimeLockClientConfig.class)
 @JsonDeserialize(as = ImmutableTimeLockClientConfig.class)
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockRuntimeConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockRuntimeConfig.java
index 9efae77e579..3f2e66a91b7 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockRuntimeConfig.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockRuntimeConfig.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableTimeLockRuntimeConfig.class)
 @JsonDeserialize(as = ImmutableTimeLockRuntimeConfig.class)
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimestampClientConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimestampClientConfig.java
index 0a62dc272ba..e547d6520e9 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimestampClientConfig.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimestampClientConfig.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableTimestampClientConfig.class)
 @JsonDeserialize(as = ImmutableTimestampClientConfig.class)
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/debug/TransactionPostMortemRunner.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/debug/TransactionPostMortemRunner.java
index 144016f46b2..d280980577b 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/debug/TransactionPostMortemRunner.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/debug/TransactionPostMortemRunner.java
@@ -16,18 +16,6 @@
 
 package com.palantir.atlasdb.debug;
 
-import java.time.Instant;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -50,6 +38,16 @@
 import com.palantir.logsafe.SafeArg;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import com.palantir.util.OptionalResolver;
+import java.time.Instant;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/DefaultPhysicalPersistentStorageFactory.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/DefaultPhysicalPersistentStorageFactory.java
index 179b374c862..361db1a096d 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/DefaultPhysicalPersistentStorageFactory.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/DefaultPhysicalPersistentStorageFactory.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.factory;
 
+import com.palantir.atlasdb.config.RocksDbPersistentStorageConfig;
+import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
+import com.palantir.atlasdb.persistent.rocksdb.RocksDbPhysicalPersistentStore;
 import java.io.File;
 import java.util.UUID;
-
 import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.atlasdb.config.RocksDbPersistentStorageConfig;
-import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
-import com.palantir.atlasdb.persistent.rocksdb.RocksDbPhysicalPersistentStore;
-
 /**
  * Constructs a new {@link PhysicalPersistentStore} with new persistent storage connection on each call of
  * {@link DefaultPhysicalPersistentStorageFactory#constructPersistentStore(RocksDbPersistentStorageConfig)}.
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java
index 070ef9ca945..9eecd922178 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java
@@ -15,23 +15,6 @@
  */
 package com.palantir.atlasdb.factory;
 
-import java.net.URI;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.InstrumentedExecutorService;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableList;
@@ -75,6 +58,21 @@
 import com.palantir.paxos.SingleLeaderAcceptorNetworkClient;
 import com.palantir.paxos.SingleLeaderLearnerNetworkClient;
 import com.palantir.paxos.SingleLeaderPinger;
+import java.net.URI;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.immutables.value.Value;
 
 public final class Leaders {
     private Leaders() {
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/LocalOrRemoteProxy.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/LocalOrRemoteProxy.java
index d739d51d553..e1481cfa71d 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/LocalOrRemoteProxy.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/LocalOrRemoteProxy.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.atlasdb.factory;
 
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.google.common.util.concurrent.Uninterruptibles;
+import com.palantir.leader.NotCurrentLeaderException;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -23,11 +27,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.google.common.util.concurrent.Uninterruptibles;
-import com.palantir.leader.NotCurrentLeaderException;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 /**
  * A proxy that chooses between using a local or remote proxy based on a task that may take a while to complete.
  */
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/PersistentStorageFactories.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/PersistentStorageFactories.java
index e096f53266e..6e8d8cbb6d6 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/PersistentStorageFactories.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/PersistentStorageFactories.java
@@ -16,6 +16,9 @@
 
 package com.palantir.atlasdb.factory;
 
+import com.google.common.base.MoreObjects;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.logsafe.SafeArg;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -28,10 +31,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.google.common.base.MoreObjects;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.logsafe.SafeArg;
-
 public final class PersistentStorageFactories {
     private static final Pattern UUID_PATTERN = Pattern.compile(
             "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceCreator.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceCreator.java
index 345ae3c77a4..c072604abf9 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceCreator.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceCreator.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.factory;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.config.AuxiliaryRemotingParameters;
 import com.palantir.atlasdb.config.ImmutableAuxiliaryRemotingParameters;
@@ -30,6 +27,8 @@
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
 import com.palantir.conjure.java.config.ssl.TrustContext;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 public final class ServiceCreator {
     private final MetricsManager metricsManager;
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java
index d0daabe0c3d..ff6ea43569d 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java
@@ -15,6 +15,18 @@
  */
 package com.palantir.atlasdb.factory;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Suppliers;
+import com.palantir.atlasdb.config.LeaderConfig;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.spi.AtlasDbFactory;
+import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig;
+import com.palantir.atlasdb.util.MetricsManager;
+import com.palantir.timestamp.ManagedTimestampService;
+import com.palantir.timestamp.TimestampStoreInvalidator;
+import com.palantir.util.debug.ThreadDumps;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -28,23 +40,9 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.StreamSupport;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Suppliers;
-import com.palantir.atlasdb.config.LeaderConfig;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.spi.AtlasDbFactory;
-import com.palantir.atlasdb.spi.KeyValueServiceConfig;
-import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig;
-import com.palantir.atlasdb.util.MetricsManager;
-import com.palantir.timestamp.ManagedTimestampService;
-import com.palantir.timestamp.TimestampStoreInvalidator;
-import com.palantir.util.debug.ThreadDumps;
-
 public class ServiceDiscoveringAtlasSupplier {
     private static final Logger log = LoggerFactory.getLogger(ServiceDiscoveringAtlasSupplier.class);
     private static final ServiceLoader<AtlasDbFactory> loader = ServiceLoader.load(AtlasDbFactory.class);
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java
index 8318b5a1cb2..19a0c422dcb 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java
@@ -15,24 +15,6 @@
  */
 package com.palantir.atlasdb.factory;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-import java.util.function.ToLongFunction;
-import java.util.stream.Collectors;
-
-import javax.ws.rs.ClientErrorException;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.annotations.VisibleForTesting;
@@ -183,6 +165,21 @@
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
 import com.palantir.util.OptionalResolver;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import java.util.function.ToLongFunction;
+import java.util.stream.Collectors;
+import javax.ws.rs.ClientErrorException;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Value.Immutable
 @Value.Style(stagedBuilder = true)
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagersInitializer.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagersInitializer.java
index b709b67066b..fc26544baa7 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagersInitializer.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagersInitializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.factory;
 
-import java.util.Set;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.async.initializer.AsyncInitializer;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.table.description.Schemas;
 import com.palantir.atlasdb.transaction.impl.TransactionTables;
 import com.palantir.common.annotation.Idempotent;
+import java.util.Set;
 
 public final class TransactionManagersInitializer extends AsyncInitializer {
 
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunner.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunner.java
index 23c7ce9d6d7..70778cd14d5 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunner.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunner.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.factory.startup;
 
-import java.util.Comparator;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.palantir.async.initializer.Callback;
@@ -30,6 +24,10 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.exception.NotInitializedException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import java.util.Comparator;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Executes multiple {@link TransactionManagerConsistencyCheck}s in sequence, aggregating the
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/TimeLockMigrator.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/TimeLockMigrator.java
index 903d40536dc..2cc0df37430 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/TimeLockMigrator.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/startup/TimeLockMigrator.java
@@ -85,4 +85,3 @@ protected String getInitializingClassName() {
         return TimeLockMigrator.class.getSimpleName();
     }
 }
-
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveLockRpcClient.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveLockRpcClient.java
index a4fc0b67918..6e3592d7fb2 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveLockRpcClient.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveLockRpcClient.java
@@ -16,10 +16,6 @@
 
 package com.palantir.atlasdb.factory.timelock;
 
-import java.math.BigInteger;
-import java.util.Optional;
-import java.util.Set;
-
 import com.palantir.lock.HeldLocksGrant;
 import com.palantir.lock.HeldLocksToken;
 import com.palantir.lock.LockClient;
@@ -29,6 +25,9 @@
 import com.palantir.lock.LockRpcClient;
 import com.palantir.lock.LockServerOptions;
 import com.palantir.lock.SimpleHeldLocksToken;
+import java.math.BigInteger;
+import java.util.Optional;
+import java.util.Set;
 
 /**
  * Given two proxies to the same set of underlying remote lock servers, one configured to expect longer-running
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveTimelockRpcClient.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveTimelockRpcClient.java
index 7000e890f7f..bd4f589b55e 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveTimelockRpcClient.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveTimelockRpcClient.java
@@ -16,9 +16,6 @@
 
 package com.palantir.atlasdb.factory.timelock;
 
-import java.util.OptionalLong;
-import java.util.Set;
-
 import com.palantir.lock.client.IdentifiedLockRequest;
 import com.palantir.lock.v2.IdentifiedTimeLockRequest;
 import com.palantir.lock.v2.LeaderTime;
@@ -37,6 +34,8 @@
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.lock.watch.TimestampWithWatches;
 import com.palantir.timestamp.TimestampRange;
+import java.util.OptionalLong;
+import java.util.Set;
 
 /**
  * Given two proxies to the same set of underlying TimeLock servers, one configured to expect longer-running operations
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockService.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockService.java
index 0dd2d34dc4a..07d61a6fc96 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockService.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockService.java
@@ -16,14 +16,13 @@
 
 package com.palantir.atlasdb.factory.timelock;
 
-import java.util.concurrent.atomic.LongAccumulator;
-import java.util.function.Supplier;
-import java.util.function.ToLongFunction;
-
 import com.palantir.lock.v2.AutoDelegate_TimelockService;
 import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.TimestampRange;
+import java.util.concurrent.atomic.LongAccumulator;
+import java.util.function.Supplier;
+import java.util.function.ToLongFunction;
 
 /**
  * A timelock service decorator for introducing runtime validity checks on received timestamps.
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapter.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapter.java
index f5ba8f9d85f..03ab8a1e5b7 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapter.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapter.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.factory.timestamp;
 
-import java.util.function.LongSupplier;
-
 import com.palantir.exception.NotInitializedException;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.timestamp.TimestampService;
+import java.util.function.LongSupplier;
 
 public class FreshTimestampSupplierAdapter implements LongSupplier {
     private volatile TimestampService timestampService;
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java
index a131f00b620..fbee0ee49d9 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.config.AuxiliaryRemotingParameters;
 import com.palantir.atlasdb.config.ServerListConfig;
@@ -28,6 +22,10 @@
 import com.palantir.atlasdb.http.v2.ConjureJavaRuntimeTargetFactory;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.conjure.java.config.ssl.TrustContext;
+import java.util.Optional;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class AtlasDbHttpClients {
     private static final Logger log = LoggerFactory.getLogger(AtlasDbHttpClients.class);
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolHandler.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolHandler.java
index e3e71f0b2d7..179680d5571 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolHandler.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolHandler.java
@@ -16,14 +16,11 @@
 
 package com.palantir.atlasdb.http;
 
+import com.palantir.conjure.java.api.errors.QosException;
 import java.util.function.Function;
-
 import javax.ws.rs.core.Response;
-
 import org.immutables.value.Value;
 
-import com.palantir.conjure.java.api.errors.QosException;
-
 interface AtlasDbHttpProtocolHandler<E extends Exception> {
     Response handleLegacyOrUnknownVersion(E underlyingException);
 
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/BlockingTimeoutExceptionMapper.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/BlockingTimeoutExceptionMapper.java
index 1dae663c7fe..5571593755c 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/BlockingTimeoutExceptionMapper.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/BlockingTimeoutExceptionMapper.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.time.Duration;
-
-import javax.ws.rs.core.Response;
-
 import com.palantir.conjure.java.api.errors.QosException;
 import com.palantir.lock.remoting.BlockingTimeoutException;
+import java.time.Duration;
+import javax.ws.rs.core.Response;
 
 /**
  * Converts {@link BlockingTimeoutException}s into appropriate status responses, depending on the user's
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ExceptionMappers.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ExceptionMappers.java
index 52ef4297359..588a3b30124 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ExceptionMappers.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ExceptionMappers.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.http;
 
+import com.palantir.remoting2.errors.SerializableError;
 import java.util.Arrays;
 import java.util.List;
-
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import com.palantir.remoting2.errors.SerializableError;
-
 public final class ExceptionMappers {
     private ExceptionMappers() {
         // utility
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotCurrentLeaderExceptionMapper.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotCurrentLeaderExceptionMapper.java
index 1b59cd46b9c..7cb9d82d35a 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotCurrentLeaderExceptionMapper.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotCurrentLeaderExceptionMapper.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.util.Optional;
-
-import javax.ws.rs.core.Response;
-
 import com.palantir.conjure.java.api.errors.QosException;
 import com.palantir.leader.NotCurrentLeaderException;
+import java.util.Optional;
+import javax.ws.rs.core.Response;
 
 /**
  * Converts {@link NotCurrentLeaderException} into appropriate status responses depending on the user's
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotInitializedExceptionMapper.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotInitializedExceptionMapper.java
index 9a89e5f5714..7447d9fbe90 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotInitializedExceptionMapper.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/NotInitializedExceptionMapper.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.http;
 
-import javax.ws.rs.core.Response;
-
 import com.palantir.conjure.java.api.errors.QosException;
 import com.palantir.exception.NotInitializedException;
+import javax.ws.rs.core.Response;
 
 /**
  * Converts {@link NotInitializedException}s into appropriate status responses, depending on the user's
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapper.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapper.java
index 4e1cd27ddc2..16a732b3bf0 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapper.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapper.java
@@ -16,9 +16,14 @@
 
 package com.palantir.atlasdb.http;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.conjure.java.api.config.service.UserAgent;
+import com.palantir.conjure.java.api.config.service.UserAgents;
+import com.palantir.conjure.java.api.errors.QosException;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.util.List;
 import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -26,18 +31,10 @@
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
-
 import org.glassfish.jersey.spi.ExceptionMappers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.conjure.java.api.config.service.UserAgent;
-import com.palantir.conjure.java.api.config.service.UserAgents;
-import com.palantir.conjure.java.api.errors.QosException;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 abstract class ProtocolAwareExceptionMapper<E extends Exception> implements ExceptionMapper<E> {
     private static final Logger log = LoggerFactory.getLogger(ProtocolAwareExceptionMapper.class);
 
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/RedirectRetryTargeter.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/RedirectRetryTargeter.java
index 9ba804d838a..5f232b05ecf 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/RedirectRetryTargeter.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/RedirectRetryTargeter.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.http;
 
-import java.net.URL;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
@@ -30,6 +23,12 @@
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.net.URL;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
 
 public final class RedirectRetryTargeter {
     private final List<URL> otherServers;
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/VersionSelectingClients.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/VersionSelectingClients.java
index beb9e2301c7..7cab71a65ca 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/VersionSelectingClients.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/VersionSelectingClients.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.http;
 
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.function.BooleanSupplier;
-import java.util.function.DoubleSupplier;
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbMetricNames;
@@ -32,6 +25,11 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.common.proxy.ExperimentRunningProxy;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.function.BooleanSupplier;
+import java.util.function.DoubleSupplier;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
 
 /**
  * Factory for randomly selecting from a new and a legacy version of a client, based on a live-reloading probability.
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigDeserializationTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigDeserializationTest.java
index 5dce53577a3..aee12f21090 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigDeserializationTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigDeserializationTest.java
@@ -17,15 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig;
+import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
-
 import org.junit.Test;
 
-import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig;
-import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
-
 public class AtlasDbConfigDeserializationTest {
     private static final File TEST_CONFIG_FILE = new File(
             AtlasDbConfigDeserializationTest.class.getResource("/test-config.yml").getPath());
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java
index 8cc37f2ea19..d5614dab391 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigTest.java
@@ -26,14 +26,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
+import java.util.Optional;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class AtlasDbConfigTest {
     private static final KeyValueServiceConfig KVS_CONFIG_WITHOUT_NAMESPACE = mock(KeyValueServiceConfig.class);
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigsTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigsTest.java
index 40ae2ac2961..05e8a35efb8 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigsTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbConfigsTest.java
@@ -17,6 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.memory.InMemoryAsyncAtlasDbConfig;
+import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig;
+import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+import com.palantir.config.crypto.KeyFileUtils;
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -24,16 +28,10 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.palantir.atlasdb.memory.InMemoryAsyncAtlasDbConfig;
-import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig;
-import com.palantir.atlasdb.spi.KeyValueServiceConfig;
-import com.palantir.config.crypto.KeyFileUtils;
-
 public class AtlasDbConfigsTest {
     private static String previousKeyPathProperty;
 
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigDeserializationTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigDeserializationTest.java
index 6478bc9a2ee..60107a35d2e 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigDeserializationTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigDeserializationTest.java
@@ -17,14 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
-
 import org.junit.Test;
 
-import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
-
 public class AtlasDbRuntimeConfigDeserializationTest {
     private static final File TEST_RUNTIME_CONFIG_FILE = new File(
             AtlasDbRuntimeConfigDeserializationTest.class.getResource("/runtime-config-block.yml").getPath());
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigTest.java
index 13207bd25f1..6134ff8316b 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfigTest.java
@@ -17,9 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.stream.StreamStorePersistenceConfiguration;
+import org.junit.Test;
 
 public class AtlasDbRuntimeConfigTest {
     @Test
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/PersistentStorageConfigTests.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/PersistentStorageConfigTests.java
index 6830210160c..d7c6f12e834 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/PersistentStorageConfigTests.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/PersistentStorageConfigTests.java
@@ -19,18 +19,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Path;
-
 import org.assertj.core.util.Files;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 public final class PersistentStorageConfigTests {
     private static final File CURRENT_WORKING_DIR = Files.currentFolder();
 
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ServerListConfigsTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ServerListConfigsTest.java
index 68517ba4dc9..b507b4f3022 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ServerListConfigsTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ServerListConfigsTest.java
@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Optional;
-
 import org.junit.Test;
 
 public class ServerListConfigsTest {
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplierTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplierTest.java
index a32c745194a..f49d8a7c821 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplierTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/ShouldRunBackgroundSweepSupplierTest.java
@@ -20,14 +20,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.sweep.queue.config.ImmutableTargetedSweepInstallConfig;
 import com.palantir.atlasdb.sweep.queue.config.ImmutableTargetedSweepRuntimeConfig;
 import com.palantir.atlasdb.sweep.queue.config.TargetedSweepInstallConfig;
 import com.palantir.atlasdb.sweep.queue.config.TargetedSweepRuntimeConfig;
+import java.util.function.Supplier;
+import org.junit.Test;
 
 public class ShouldRunBackgroundSweepSupplierTest {
     private static final TargetedSweepInstallConfig SWEEP_QUEUE_WRITES_ENABLED
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/TimeLockClientConfigTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/TimeLockClientConfigTest.java
index eb408592249..2cef41b0e1e 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/config/TimeLockClientConfigTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/config/TimeLockClientConfigTest.java
@@ -22,14 +22,12 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import java.util.List;
 import java.util.Optional;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
-
 public class TimeLockClientConfigTest {
     private static final String CLIENT = "testClient";
     private static final String SERVER_1 = "http://localhost:8080";
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java
index 3dc12c5e190..a5683065f34 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.factory;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-import org.jmock.Mockery;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.auto.service.AutoService;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.config.LeaderConfig;
@@ -35,6 +25,14 @@
 import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import org.jmock.Mockery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @AutoService(AtlasDbFactory.class)
 public class AutoServiceAnnotatedAtlasDbFactory implements AtlasDbFactory {
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/DefaultPhysicalPersistentStorageFactoryTests.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/DefaultPhysicalPersistentStorageFactoryTests.java
index 71fadf54bfd..4a252e95792 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/DefaultPhysicalPersistentStorageFactoryTests.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/DefaultPhysicalPersistentStorageFactoryTests.java
@@ -18,21 +18,19 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.config.ImmutableRocksDbPersistentStorageConfig;
+import com.palantir.atlasdb.config.RocksDbPersistentStorageConfig;
+import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
 import java.io.File;
 import java.util.List;
-
 import org.assertj.core.util.Files;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.config.ImmutableRocksDbPersistentStorageConfig;
-import com.palantir.atlasdb.config.RocksDbPersistentStorageConfig;
-import com.palantir.atlasdb.persistent.api.PhysicalPersistentStore;
-
 public final class DefaultPhysicalPersistentStorageFactoryTests {
     @Rule
     public TemporaryFolder testFolder = new TemporaryFolder(Files.currentFolder());
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/LeadersTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/LeadersTest.java
index 2e7f1793c4a..777ace9172c 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/LeadersTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/LeadersTest.java
@@ -23,15 +23,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-
-import org.hamcrest.MatcherAssert;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.config.RemotingClientConfig;
@@ -41,6 +32,13 @@
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosLearner;
 import com.palantir.paxos.PaxosValue;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+import org.hamcrest.MatcherAssert;
+import org.junit.Test;
 
 public class LeadersTest {
 
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/PersistentStorageFactoriesTests.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/PersistentStorageFactoriesTests.java
index 478cf43bfe7..934f525f05e 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/PersistentStorageFactoriesTests.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/PersistentStorageFactoriesTests.java
@@ -19,17 +19,15 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import java.io.File;
 import java.io.IOException;
 import java.util.UUID;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
 public final class PersistentStorageFactoriesTests {
     public static final String FIRST_SUBFOLDER_ROOT = "first";
     public static final String SECOND_SUBFOLDER_ROOT = "second";
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java
index aa5d623dc4e..d7ae9904d9b 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java
@@ -19,13 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.mockito.Mockito.mock;
 
-import java.io.IOException;
-import java.util.Optional;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.spi.AtlasDbFactory;
@@ -34,6 +27,11 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.io.IOException;
+import java.util.Optional;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class ServiceDiscoveringAtlasSupplierTest {
     private final KeyValueServiceConfigHelper kvsConfig = () -> AutoServiceAnnotatedAtlasDbFactory.TYPE;
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java
index 66e027b4894..ca5d099892e 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/TransactionManagersTest.java
@@ -15,6 +15,13 @@
  */
 package com.palantir.atlasdb.factory;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -31,39 +38,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import javax.ws.rs.core.Response;
-
-import org.assertj.core.util.Files;
-import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
 import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -138,6 +112,28 @@
 import com.palantir.timestamp.TimestampStoreInvalidator;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import com.palantir.tritium.metrics.registry.MetricName;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import javax.ws.rs.core.Response;
+import org.assertj.core.util.Files;
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 public class TransactionManagersTest {
     private static final String CLIENT = "testClient";
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunnerTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunnerTest.java
index 13e668d132b..9afebd02345 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunnerTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/ConsistencyCheckRunnerTest.java
@@ -18,14 +18,13 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.factory.ImmutableTransactionManagerConsistencyResult;
 import com.palantir.atlasdb.factory.TransactionManagerConsistencyResult;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.atlasdb.transaction.impl.consistency.TransactionManagerConsistencyCheck;
 import com.palantir.exception.NotInitializedException;
+import org.junit.Test;
 
 public class ConsistencyCheckRunnerTest {
     private static final RuntimeException EXCEPTION_1 = new RuntimeException("bad");
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimeLockMigratorTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimeLockMigratorTest.java
index 538d75c806b..b938a30ab05 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimeLockMigratorTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimeLockMigratorTest.java
@@ -23,8 +23,10 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.palantir.common.exception.AtlasDbDependencyException;
+import com.palantir.timestamp.TimestampManagementService;
+import com.palantir.timestamp.TimestampStoreInvalidator;
 import java.util.concurrent.TimeUnit;
-
 import org.awaitility.Awaitility;
 import org.junit.After;
 import org.junit.Before;
@@ -33,10 +35,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.palantir.common.exception.AtlasDbDependencyException;
-import com.palantir.timestamp.TimestampManagementService;
-import com.palantir.timestamp.TimestampStoreInvalidator;
-
 @RunWith(MockitoJUnitRunner.class)
 public class TimeLockMigratorTest {
     private static final long BACKUP_TIMESTAMP = 42;
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveLockRpcClientTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveLockRpcClientTest.java
index 4c12c534072..0f53202c166 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveLockRpcClientTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveLockRpcClientTest.java
@@ -20,14 +20,13 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSortedMap;
 import com.palantir.lock.LockClient;
 import com.palantir.lock.LockMode;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.LockRpcClient;
 import com.palantir.lock.StringLockDescriptor;
+import org.junit.Test;
 
 public class BlockingSensitiveLockRpcClientTest {
     private static final String NAMESPACE = "namespace";
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveTimelockRpcClientTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveTimelockRpcClientTest.java
index 428220eb3d1..6b416aee716 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveTimelockRpcClientTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/BlockingSensitiveTimelockRpcClientTest.java
@@ -20,10 +20,6 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import java.util.UUID;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.lock.client.IdentifiedLockRequest;
@@ -31,6 +27,8 @@
 import com.palantir.lock.v2.StartTransactionRequestV5;
 import com.palantir.lock.v2.TimelockRpcClient;
 import com.palantir.lock.v2.WaitForLocksRequest;
+import java.util.UUID;
+import org.junit.Test;
 
 public class BlockingSensitiveTimelockRpcClientTest {
     private static final String NAMESPACE = "namespace";
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockServiceTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockServiceTest.java
index 84bec5d350c..afcae747121 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockServiceTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timelock/TimestampCorroboratingTimelockServiceTest.java
@@ -23,23 +23,21 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.palantir.lock.v2.LockImmutableTimestampResponse;
+import com.palantir.lock.v2.LockToken;
+import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse;
+import com.palantir.lock.v2.TimelockService;
+import com.palantir.lock.v2.TimestampAndPartition;
+import com.palantir.timestamp.TimestampRange;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import com.palantir.lock.v2.LockImmutableTimestampResponse;
-import com.palantir.lock.v2.LockToken;
-import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse;
-import com.palantir.lock.v2.TimelockService;
-import com.palantir.lock.v2.TimestampAndPartition;
-import com.palantir.timestamp.TimestampRange;
-
 public class TimestampCorroboratingTimelockServiceTest {
     private static final LockImmutableTimestampResponse LOCK_IMMUTABLE_TIMESTAMP_RESPONSE =
             LockImmutableTimestampResponse.of(1L, LockToken.of(UUID.randomUUID()));
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapterTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapterTest.java
index e6fadabbb3a..74c8517bf51 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapterTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/timestamp/FreshTimestampSupplierAdapterTest.java
@@ -23,10 +23,9 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.internal.verification.VerificationModeFactory.times;
 
-import org.junit.Test;
-
 import com.palantir.exception.NotInitializedException;
 import com.palantir.timestamp.TimestampService;
+import org.junit.Test;
 
 public class FreshTimestampSupplierAdapterTest {
     private final FreshTimestampSupplierAdapter adapter = new FreshTimestampSupplierAdapter();
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpClientsTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpClientsTest.java
index e15e564fa16..be421425a76 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpClientsTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpClientsTest.java
@@ -15,38 +15,16 @@
  */
 package com.palantir.atlasdb.http;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
 
 import com.github.tomakehurst.wiremock.client.MappingBuilder;
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
@@ -70,6 +48,24 @@
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
 import com.palantir.conjure.java.config.ssl.TrustContext;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
 
 public class AtlasDbHttpClientsTest {
 
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersionTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersionTest.java
index ae64f832d24..572d28efb64 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersionTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersionTest.java
@@ -20,7 +20,6 @@
 
 import java.util.Optional;
 import java.util.stream.Stream;
-
 import org.junit.Test;
 
 public class AtlasDbHttpProtocolVersionTest {
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersSerializationTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersSerializationTest.java
index e16862898b0..4d386bf3805 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersSerializationTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersSerializationTest.java
@@ -17,18 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.File;
-import java.io.IOException;
-
-import javax.ws.rs.core.Response;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.palantir.common.remoting.ServiceNotAvailableException;
 import com.palantir.conjure.java.serialization.ObjectMappers;
 import com.palantir.remoting2.errors.SerializableError;
+import java.io.File;
+import java.io.IOException;
+import javax.ws.rs.core.Response;
+import org.junit.Test;
 
 public class ExceptionMappersSerializationTest {
     private static final ObjectMapper MAPPER = ObjectMappers.newServerObjectMapper();
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersTest.java
index 2c52d0dbeb4..5bf83e87786 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ExceptionMappersTest.java
@@ -17,16 +17,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.net.HttpHeaders;
+import com.palantir.remoting2.errors.SerializableError;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
 import org.apache.http.HttpStatus;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.net.HttpHeaders;
-import com.palantir.remoting2.errors.SerializableError;
-
 public class ExceptionMappersTest {
     private static final Exception RUNTIME_EXCEPTION = new RuntimeException("foo");
     private static final Response RESPONSE_503_WITHOUT_RETRY_AFTER
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapperTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapperTest.java
index 03c75a31e2e..b1f3397816b 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapperTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/ProtocolAwareExceptionMapperTest.java
@@ -18,11 +18,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.conjure.java.api.config.service.UserAgent;
 import com.palantir.conjure.java.api.config.service.UserAgents;
+import org.junit.Test;
 
 public class ProtocolAwareExceptionMapperTest {
     private static final UserAgent USER_AGENT_1 = createBaseUserAgent("Bond", "0.0.7");
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/RedirectRetryTargeterTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/RedirectRetryTargeterTest.java
index 1ff058706b4..f255cb658b8 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/RedirectRetryTargeterTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/RedirectRetryTargeterTest.java
@@ -19,6 +19,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.net.HostAndPort;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -27,12 +29,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.net.HostAndPort;
-
 public class RedirectRetryTargeterTest {
     private static final URL URL_1 = createUrlUnchecked("https", "hostage", 42, "/request/hourai-branch");
     private static final URL URL_2 = createUrlUnchecked("https", "hostile", 424, "/request/swallows-cowrie-shell");
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/VersionSelectingClientsTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/VersionSelectingClientsTest.java
index ebf33f15de7..711ead8288e 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/http/VersionSelectingClientsTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/http/VersionSelectingClientsTest.java
@@ -26,11 +26,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.IntStream;
-
-import org.junit.Test;
-
 import com.google.common.util.concurrent.AtomicDouble;
 import com.palantir.atlasdb.AtlasDbMetricNames;
 import com.palantir.atlasdb.http.VersionSelectingClients.VersionSelectingConfig;
@@ -39,6 +34,9 @@
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.common.proxy.ExperimentRunningProxy;
 import com.palantir.timestamp.TimestampService;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.IntStream;
+import org.junit.Test;
 
 public class VersionSelectingClientsTest {
     private final AtomicDouble probability = new AtomicDouble(0.0);
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvs.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvs.java
index ccfe4d249cc..3ade0eb5dec 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvs.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvs.java
@@ -79,4 +79,3 @@ public boolean shouldTriggerCompactions() {
         return false;
     }
 }
-
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvsTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvsTest.java
index bac34d578d3..3202f2b2f58 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvsTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/keyvalue/impl/AsyncInitializeableInMemoryKvsTest.java
@@ -19,14 +19,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.exception.NotInitializedException;
 import java.util.concurrent.TimeUnit;
-
 import org.awaitility.Awaitility;
 import org.junit.Test;
 
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.exception.NotInitializedException;
-
 public class AsyncInitializeableInMemoryKvsTest {
 
     @Test
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbConfig.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbConfig.java
index 795741c4af3..0559d0f0afe 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbConfig.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbConfig.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.memory;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.auto.service.AutoService;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @JsonTypeName(InMemoryAsyncAtlasDbConfig.TYPE)
 @AutoService(KeyValueServiceConfig.class)
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactory.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactory.java
index 87f2d3d75c8..f4533a8750a 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactory.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactory.java
@@ -16,10 +16,6 @@
 
 package com.palantir.atlasdb.memory;
 
-import java.util.Optional;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
 import com.google.auto.service.AutoService;
 import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -33,6 +29,9 @@
 import com.palantir.atlasdb.versions.AtlasDbVersion;
 import com.palantir.timestamp.InMemoryTimestampService;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.Optional;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
 
 @AutoService(AtlasDbFactory.class)
 public class InMemoryAsyncAtlasDbFactory implements AtlasDbFactory {
@@ -67,4 +66,3 @@ public ManagedTimestampService createManagedTimestampService(
         return new InMemoryTimestampService();
     }
 }
-
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java
index 1e061897cb5..a09c565916c 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java
@@ -19,16 +19,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-import org.awaitility.Awaitility;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.spi.AtlasDbFactory;
 import com.palantir.exception.NotInitializedException;
 import com.palantir.timestamp.TimestampService;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Test;
 
 public class InMemoryAsyncAtlasDbFactoryTest {
     private final AtlasDbFactory factory = new InMemoryAsyncAtlasDbFactory();
diff --git a/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/ClientOptions.java b/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/ClientOptions.java
index 515190655a2..117b8ce7001 100644
--- a/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/ClientOptions.java
+++ b/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/ClientOptions.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.http.v2;
 
-import java.net.ProxySelector;
-import java.time.Duration;
-import java.util.List;
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.config.AuxiliaryRemotingParameters;
 import com.palantir.atlasdb.config.ServerListConfig;
@@ -32,6 +25,11 @@
 import com.palantir.conjure.java.config.ssl.TrustContext;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.net.ProxySelector;
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class ClientOptions {
diff --git a/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/ConjureJavaRuntimeTargetFactory.java b/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/ConjureJavaRuntimeTargetFactory.java
index 63eb2904a7e..1f6fa124f17 100644
--- a/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/ConjureJavaRuntimeTargetFactory.java
+++ b/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/ConjureJavaRuntimeTargetFactory.java
@@ -16,9 +16,6 @@
 
 package com.palantir.atlasdb.http.v2;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.config.AuxiliaryRemotingParameters;
 import com.palantir.atlasdb.config.ImmutableAuxiliaryRemotingParameters;
@@ -32,6 +29,8 @@
 import com.palantir.conjure.java.config.ssl.TrustContext;
 import com.palantir.conjure.java.okhttp.HostMetricsRegistry;
 import com.palantir.util.CachedTransformingSupplier;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 public final class ConjureJavaRuntimeTargetFactory implements TargetFactory {
     private static final HostMetricsRegistry HOST_METRICS_REGISTRY = new HostMetricsRegistry();
diff --git a/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/FastFailoverProxy.java b/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/FastFailoverProxy.java
index e5ef1243477..043068189dd 100644
--- a/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/FastFailoverProxy.java
+++ b/atlasdb-conjure/src/main/java/com/palantir/atlasdb/http/v2/FastFailoverProxy.java
@@ -16,6 +16,12 @@
 
 package com.palantir.atlasdb.http.v2;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.palantir.common.base.Throwables;
+import com.palantir.conjure.java.api.errors.QosException;
+import feign.RetryableException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -24,17 +30,8 @@
 import java.time.Instant;
 import java.util.Optional;
 import java.util.function.Supplier;
-
 import org.immutables.value.Value;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.palantir.common.base.Throwables;
-import com.palantir.conjure.java.api.errors.QosException;
-
-import feign.RetryableException;
-
 /**
  * This proxy exists to support "fast failover" behaviour with no limit as to the number of attempts made; instead,
  * we use a time limit. This exists to support perpetual {@code 308} responses from servers, which may happen if
diff --git a/atlasdb-conjure/src/test/java/com/palantir/atlasdb/http/v2/ClientOptionsTest.java b/atlasdb-conjure/src/test/java/com/palantir/atlasdb/http/v2/ClientOptionsTest.java
index 60caa4ec97d..a12fca23710 100644
--- a/atlasdb-conjure/src/test/java/com/palantir/atlasdb/http/v2/ClientOptionsTest.java
+++ b/atlasdb-conjure/src/test/java/com/palantir/atlasdb/http/v2/ClientOptionsTest.java
@@ -18,13 +18,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.time.Duration;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.config.AuxiliaryRemotingParameters;
 import com.palantir.conjure.java.api.config.service.UserAgent;
 import com.palantir.conjure.java.client.config.ClientConfiguration;
+import java.time.Duration;
+import org.junit.Test;
 
 public class ClientOptionsTest {
     private static final UserAgent USER_AGENT = UserAgent.of(UserAgent.Agent.of("tom", "1.2.3"));
diff --git a/atlasdb-conjure/src/test/java/com/palantir/atlasdb/http/v2/FastFailoverProxyTest.java b/atlasdb-conjure/src/test/java/com/palantir/atlasdb/http/v2/FastFailoverProxyTest.java
index 72d9c986d62..ca0cdf53611 100644
--- a/atlasdb-conjure/src/test/java/com/palantir/atlasdb/http/v2/FastFailoverProxyTest.java
+++ b/atlasdb-conjure/src/test/java/com/palantir/atlasdb/http/v2/FastFailoverProxyTest.java
@@ -25,6 +25,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.palantir.conjure.java.api.errors.QosException;
+import com.palantir.logsafe.exceptions.SafeIoException;
+import feign.RetryableException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.sql.Date;
@@ -33,15 +36,9 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BinaryOperator;
 import java.util.function.LongConsumer;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.conjure.java.api.errors.QosException;
-import com.palantir.logsafe.exceptions.SafeIoException;
-
-import feign.RetryableException;
-
 @SuppressWarnings("unchecked") // Mock usage
 public class FastFailoverProxyTest {
     private final BinaryOperator<Integer> binaryOperator = mock(BinaryOperator.class);
diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleBinder.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleBinder.java
index 3aa0126efa5..b0080bebed5 100644
--- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleBinder.java
+++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleBinder.java
@@ -15,18 +15,15 @@
  */
 package com.palantir.atlasdb.console;
 
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.codehaus.groovy.runtime.MethodClosure;
-
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.console.annotations.ConsoleBinding;
-
 import groovy.lang.Binding;
 import groovy.lang.Closure;
+import java.lang.reflect.Method;
+import java.util.Map;
+import org.codehaus.groovy.runtime.MethodClosure;
 
 public final class AtlasConsoleBinder {
 
diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleJoins.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleJoins.java
index 3330e6a70ed..7c651fafb3f 100644
--- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleJoins.java
+++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleJoins.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.atlasdb.console;
 
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
 /**
  * Utility for joins.
  */
diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java
index 76ff8f130c5..b116b6a86ba 100644
--- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java
+++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java
@@ -15,12 +15,17 @@
  */
 package com.palantir.atlasdb.console;
 
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.palantir.atlasdb.console.module.AtlasCoreModule;
+import groovy.lang.Binding;
+import groovy.lang.GroovyShell;
+import groovy.lang.Script;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
@@ -31,14 +36,6 @@
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.tools.shell.Main;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.palantir.atlasdb.console.module.AtlasCoreModule;
-
-import groovy.lang.Binding;
-import groovy.lang.GroovyShell;
-import groovy.lang.Script;
-
 public class AtlasConsoleMain {
 
     private static final String HELP_FLAG_SHORT = "h";
diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleModule.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleModule.java
index ab1bf772df6..bb6a02fb87f 100644
--- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleModule.java
+++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleModule.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.console;
 
-import java.util.Map;
-
 import groovy.lang.Closure;
+import java.util.Map;
 
 public interface AtlasConsoleModule {
     /**
diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleService.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleService.java
index d6069ba411f..5dd6ed1417c 100644
--- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleService.java
+++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleService.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.console;
 
-import java.io.IOException;
-
 import com.palantir.atlasdb.api.TransactionToken;
+import java.io.IOException;
 
 public interface AtlasConsoleService {
     String tables() throws IOException;
diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceImpl.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceImpl.java
index 8ae1906de3e..b9740757d1a 100644
--- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceImpl.java
+++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceImpl.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.console;
 
-import java.io.IOException;
-import java.util.Set;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.palantir.atlasdb.api.AtlasDbService;
 import com.palantir.atlasdb.api.RangeToken;
@@ -28,6 +25,8 @@
 import com.palantir.atlasdb.api.TableRowSelection;
 import com.palantir.atlasdb.api.TransactionToken;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.util.Set;
 
 public class AtlasConsoleServiceImpl implements AtlasConsoleService {
 
diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/DisconnectedAtlasConsoleService.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/DisconnectedAtlasConsoleService.java
index 19f8df606c8..1e1c52ae692 100644
--- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/DisconnectedAtlasConsoleService.java
+++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/DisconnectedAtlasConsoleService.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.console;
 
-import java.io.IOException;
-
 import com.palantir.atlasdb.api.TransactionToken;
+import java.io.IOException;
 
 public class DisconnectedAtlasConsoleService implements AtlasConsoleService {
 
diff --git a/atlasdb-console/src/test/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceTest.java b/atlasdb-console/src/test/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceTest.java
index e1c00a3c96c..bfb5b3d6e09 100644
--- a/atlasdb-console/src/test/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceTest.java
+++ b/atlasdb-console/src/test/groovy/com/palantir/atlasdb/console/AtlasConsoleServiceTest.java
@@ -17,16 +17,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -41,6 +31,14 @@
 import com.palantir.atlasdb.api.TableRowSelection;
 import com.palantir.atlasdb.api.TransactionToken;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AtlasConsoleServiceTest {
     private final Mockery context = new Mockery();
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraCliParser.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraCliParser.java
index 0916fdfbfc3..c4c62bbda7e 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraCliParser.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraCliParser.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.containers;
 
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
 public final class CassandraCliParser {
     private static final Logger log = LoggerFactory.getLogger(CassandraCliParser.class);
 
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraContainer.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraContainer.java
index 79c7b337df2..3d29bfe3399 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraContainer.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraContainer.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.containers;
 
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
 import com.datastax.driver.core.Cluster;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
@@ -37,6 +31,11 @@
 import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
 import com.palantir.logsafe.Preconditions;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
 
 public class CassandraContainer extends Container {
     static final int CASSANDRA_CQL_PORT = 9042;
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraEnvironment.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraEnvironment.java
index 4412ea48a3d..9a56979317d 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraEnvironment.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraEnvironment.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.containers;
 
-import java.util.Map;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 
 public final class CassandraEnvironment {
     public static final String CASSANDRA_VERSION = "CASSANDRA_VERSION";
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraResource.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraResource.java
index 2a6ce8285c8..6ce3ffaa763 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraResource.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/CassandraResource.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.containers;
 
-import java.net.Proxy;
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import org.junit.rules.ExternalResource;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
@@ -32,6 +24,12 @@
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.keyvalue.impl.TransactionManagerManager;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.net.Proxy;
+import java.util.Optional;
+import java.util.function.Supplier;
+import org.junit.rules.ExternalResource;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
 
 public class CassandraResource extends ExternalResource implements KvsManager, TransactionManagerManager {
     private final CassandraContainer containerInstance = new CassandraContainer();
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Container.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Container.java
index e0f971f9e8d..c3303310300 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Container.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Container.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.containers;
 
-import java.util.Map;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
+import java.util.Map;
 
 public abstract class Container {
     public abstract String getDockerComposeFile();
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Containers.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Containers.java
index 4eb74adf7b6..b6930c293fc 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Containers.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/Containers.java
@@ -15,6 +15,20 @@
  */
 package com.palantir.atlasdb.containers;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Throwables;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.Sets;
+import com.palantir.docker.compose.DockerComposeRule;
+import com.palantir.docker.compose.configuration.DockerComposeFiles;
+import com.palantir.docker.compose.configuration.ProjectName;
+import com.palantir.docker.compose.configuration.ShutdownStrategy;
+import com.palantir.docker.compose.connection.DockerMachine;
+import com.palantir.docker.compose.execution.DockerCompose;
+import com.palantir.docker.compose.logging.LogDirectory;
+import com.palantir.docker.proxy.DockerProxyRule;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -27,27 +41,11 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.apache.commons.io.IOUtils;
 import org.awaitility.Awaitility;
 import org.awaitility.Duration;
 import org.junit.rules.ExternalResource;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Throwables;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.Sets;
-import com.palantir.docker.compose.DockerComposeRule;
-import com.palantir.docker.compose.configuration.DockerComposeFiles;
-import com.palantir.docker.compose.configuration.ProjectName;
-import com.palantir.docker.compose.configuration.ShutdownStrategy;
-import com.palantir.docker.compose.connection.DockerMachine;
-import com.palantir.docker.compose.execution.DockerCompose;
-import com.palantir.docker.compose.logging.LogDirectory;
-import com.palantir.docker.proxy.DockerProxyRule;
-
 @SuppressWarnings("ShutdownHook")
 public class Containers extends ExternalResource {
     private static final ProjectName PROJECT_NAME = ProjectName.fromString("atlasdbcontainers");
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/InterruptibleFileLogCollector.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/InterruptibleFileLogCollector.java
index 07833296ac4..5589c6a7fda 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/InterruptibleFileLogCollector.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/InterruptibleFileLogCollector.java
@@ -15,26 +15,23 @@
  */
 package com.palantir.atlasdb.containers;
 
+import com.palantir.docker.compose.connection.ContainerName;
+import com.palantir.docker.compose.execution.DockerCompose;
+import com.palantir.docker.compose.logging.FileLogCollector;
+import com.palantir.docker.compose.logging.LogCollector;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.docker.compose.connection.ContainerName;
-import com.palantir.docker.compose.execution.DockerCompose;
-import com.palantir.docker.compose.logging.FileLogCollector;
-import com.palantir.docker.compose.logging.LogCollector;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.logsafe.exceptions.SafeRuntimeException;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 @SuppressFBWarnings("SLF4J_ILLEGAL_PASSED_CLASS")
 public class InterruptibleFileLogCollector implements LogCollector {
     private static final Logger log = LoggerFactory.getLogger(FileLogCollector.class);
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/SocksProxyNettyOptions.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/SocksProxyNettyOptions.java
index 910b1515521..76d0fe552e1 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/SocksProxyNettyOptions.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/SocksProxyNettyOptions.java
@@ -16,12 +16,10 @@
 
 package com.palantir.atlasdb.containers;
 
-import java.net.SocketAddress;
-
 import com.datastax.driver.core.NettyOptions;
-
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.proxy.Socks5ProxyHandler;
+import java.net.SocketAddress;
 
 final class SocksProxyNettyOptions extends NettyOptions {
     private final SocketAddress proxyAddress;
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraCluster.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraCluster.java
index c3f2faab4d2..d93f283ba45 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraCluster.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraCluster.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.containers;
 
-import java.net.InetSocketAddress;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig;
@@ -29,6 +23,10 @@
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl;
 import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
+import java.net.InetSocketAddress;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ThreeNodeCassandraCluster extends Container {
     private static final Logger log = LoggerFactory.getLogger(ThreeNodeCassandraCluster.class);
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraClusterOperations.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraClusterOperations.java
index 658d7bb3a9f..af95d905056 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraClusterOperations.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraClusterOperations.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.containers;
 
-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.execution.DockerComposeRunArgument;
 import com.palantir.docker.compose.execution.ImmutableDockerComposeRunOption;
+import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ThreeNodeCassandraClusterOperations {
     private static final Logger log = LoggerFactory.getLogger(ThreeNodeCassandraClusterOperations.class);
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraResource.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraResource.java
index 5a6ccd848c7..9243cbd430f 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraResource.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/ThreeNodeCassandraResource.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.containers;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import org.junit.rules.ExternalResource;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl;
@@ -30,6 +23,11 @@
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.keyvalue.impl.TransactionManagerManager;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Optional;
+import java.util.function.Supplier;
+import org.junit.rules.ExternalResource;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
 
 public class ThreeNodeCassandraResource extends ExternalResource implements KvsManager, TransactionManagerManager {
     private final Supplier<KeyValueService> supplier;
diff --git a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/UninitializedCassandraResource.java b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/UninitializedCassandraResource.java
index caa5064d8c1..67da27cd4c2 100644
--- a/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/UninitializedCassandraResource.java
+++ b/atlasdb-container-test-utils/src/main/java/com/palantir/atlasdb/containers/UninitializedCassandraResource.java
@@ -16,12 +16,6 @@
 
 package com.palantir.atlasdb.containers;
 
-import java.io.IOException;
-import java.net.Proxy;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.junit.rules.ExternalResource;
-
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceRuntimeConfig;
 import com.palantir.atlasdb.cassandra.CassandraMutationTimestampProviders;
@@ -30,6 +24,10 @@
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.common.base.Throwables;
 import com.palantir.logsafe.Preconditions;
+import java.io.IOException;
+import java.net.Proxy;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.rules.ExternalResource;
 
 public class UninitializedCassandraResource extends ExternalResource {
     private final CassandraContainer containerInstance = CassandraContainer.throwawayContainer();
diff --git a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/CassandraEnvironmentTest.java b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/CassandraEnvironmentTest.java
index 8d0648e98c6..069eb74c8c1 100644
--- a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/CassandraEnvironmentTest.java
+++ b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/CassandraEnvironmentTest.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertThat;
 
 import java.util.Map;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
diff --git a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/ContainerTest.java b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/ContainerTest.java
index fbad775f263..1682056ad6e 100644
--- a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/ContainerTest.java
+++ b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/ContainerTest.java
@@ -19,7 +19,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/FirstNginxContainer.java b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/FirstNginxContainer.java
index 18d4a6ed1af..1c6fcc0246b 100644
--- a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/FirstNginxContainer.java
+++ b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/FirstNginxContainer.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.containers;
 
-import java.net.HttpURLConnection;
-import java.net.URL;
-
 import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
+import java.net.HttpURLConnection;
+import java.net.URL;
 
 public class FirstNginxContainer extends Container {
     @Override
diff --git a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/SecondNginxContainer.java b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/SecondNginxContainer.java
index 63f0438b742..d4ce355a5f2 100644
--- a/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/SecondNginxContainer.java
+++ b/atlasdb-container-test-utils/src/test/java/com/palantir/atlasdb/containers/SecondNginxContainer.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.containers;
 
-import java.net.HttpURLConnection;
-import java.net.URL;
-
 import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
+import java.net.HttpURLConnection;
+import java.net.URL;
 
 public class SecondNginxContainer extends Container {
     @Override
diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationService.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationService.java
index 4af51ac20bd..82f49ee3b6e 100644
--- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationService.java
+++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationService.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.coordination;
 
-import java.util.Optional;
-import java.util.function.Function;
-
 import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
 import com.palantir.atlasdb.metrics.Timed;
+import java.util.Optional;
+import java.util.function.Function;
 
 /**
  * A {@link CoordinationService} is used to agree on values being relevant or correct at a given timestamp.
diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationServiceImpl.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationServiceImpl.java
index 52fe667f91d..4e1c2287af3 100644
--- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationServiceImpl.java
+++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationServiceImpl.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.coordination;
 
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
+import com.palantir.logsafe.SafeArg;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Iterables;
-import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
-import com.palantir.logsafe.SafeArg;
-
 public class CoordinationServiceImpl<T> implements CoordinationService<T> {
     private static final Logger log = LoggerFactory.getLogger(CoordinationServiceImpl.class);
 
diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationStore.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationStore.java
index 581bcb9a7a5..6a89e77f99f 100644
--- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationStore.java
+++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/CoordinationStore.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.coordination;
 
-import java.util.Optional;
-import java.util.function.Function;
-
 import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
 import com.palantir.processors.AutoDelegate;
 import com.palantir.processors.DoDelegate;
+import java.util.Optional;
+import java.util.function.Function;
 
 /**
  * A {@link CoordinationStore} stores data that a {@link CoordinationService} may use.
diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/SequenceAndBound.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/SequenceAndBound.java
index 48037fe2d34..1431337d929 100644
--- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/SequenceAndBound.java
+++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/SequenceAndBound.java
@@ -16,10 +16,9 @@
 
 package com.palantir.atlasdb.coordination;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 /**
  * A pair of a sequence number and a bound on the validity of the value associated with that sequence number.
diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/TransformingCoordinationService.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/TransformingCoordinationService.java
index 4042c2fe374..25ea3120ce6 100644
--- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/TransformingCoordinationService.java
+++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/TransformingCoordinationService.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.coordination;
 
+import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
-
 /**
  * A {@link TransformingCoordinationService} is a {@link CoordinationService} for T2 objects that uses an underlying
  * {@link CoordinationService} for T1 objects.
diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/ValueAndBound.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/ValueAndBound.java
index 3134911c4a5..522abc258d9 100644
--- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/ValueAndBound.java
+++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/ValueAndBound.java
@@ -17,7 +17,6 @@
 package com.palantir.atlasdb.coordination;
 
 import java.util.Optional;
-
 import org.immutables.value.Value;
 
 /**
diff --git a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStore.java b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStore.java
index 7782d79868d..eb1c21eaa80 100644
--- a/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStore.java
+++ b/atlasdb-coordination-impl/src/main/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStore.java
@@ -16,17 +16,6 @@
 
 package com.palantir.atlasdb.coordination.keyvalue;
 
-import java.io.IOException;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.BiPredicate;
-import java.util.function.Function;
-import java.util.function.LongSupplier;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.VisibleForTesting;
@@ -53,6 +42,15 @@
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.io.IOException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiPredicate;
+import java.util.function.Function;
+import java.util.function.LongSupplier;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An implementation of {@link CoordinationStore} that persists its state in a {@link KeyValueService}.
diff --git a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/CoordinationServiceImplTest.java b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/CoordinationServiceImplTest.java
index a376fc88fa1..df00f421c36 100644
--- a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/CoordinationServiceImplTest.java
+++ b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/CoordinationServiceImplTest.java
@@ -24,10 +24,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.coordination.CoordinationService;
@@ -35,6 +31,8 @@
 import com.palantir.atlasdb.coordination.CoordinationStore;
 import com.palantir.atlasdb.coordination.ValueAndBound;
 import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
+import java.util.Optional;
+import org.junit.Test;
 
 public class CoordinationServiceImplTest {
     private static final String STRING = "string";
diff --git a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStoreTest.java b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStoreTest.java
index 551422b25d6..c2e06da0599 100644
--- a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStoreTest.java
+++ b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/KeyValueServiceCoordinationStoreTest.java
@@ -27,12 +27,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Function;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
@@ -52,6 +46,10 @@
 import com.palantir.atlasdb.keyvalue.impl.ImmutableCheckAndSetResult;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.conjure.java.serialization.ObjectMappers;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.junit.Test;
 
 public class KeyValueServiceCoordinationStoreTest {
     private static final byte[] COORDINATION_ROW = PtBytes.toBytes("aaaaa");
diff --git a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/TransformingCoordinationServiceTest.java b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/TransformingCoordinationServiceTest.java
index 9dda630419f..009efdec799 100644
--- a/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/TransformingCoordinationServiceTest.java
+++ b/atlasdb-coordination-impl/src/test/java/com/palantir/atlasdb/coordination/keyvalue/TransformingCoordinationServiceTest.java
@@ -23,17 +23,15 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-import java.util.function.Function;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.coordination.CoordinationService;
 import com.palantir.atlasdb.coordination.TransformingCoordinationService;
 import com.palantir.atlasdb.coordination.ValueAndBound;
 import com.palantir.atlasdb.keyvalue.impl.CheckAndSetResult;
+import java.util.Optional;
+import java.util.function.Function;
+import org.junit.Before;
+import org.junit.Test;
 
 @SuppressWarnings("unchecked") // This test uses mocks liberally
 public class TransformingCoordinationServiceTest {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/AtlasDbServices.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/AtlasDbServices.java
index 2bd8f5da2c3..1ed815cdfde 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/AtlasDbServices.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/AtlasDbServices.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.services;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.AtlasDbRuntimeConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -27,8 +24,9 @@
 import com.palantir.lock.LockService;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.ManagedTimestampService;
-
 import dagger.Component;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 @Singleton
 @Component(modules = { ServicesConfigModule.class, KeyValueServiceModule.class, RawKeyValueServiceModule.class,
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/KeyValueServiceModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/KeyValueServiceModule.java
index 9a5e2b997b7..51a64d2cf4d 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/KeyValueServiceModule.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/KeyValueServiceModule.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.services;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.config.SweepConfig;
 import com.palantir.atlasdb.coordination.CoordinationService;
@@ -44,9 +41,10 @@
 import com.palantir.atlasdb.util.AtlasDbMetrics;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.timestamp.TimestampService;
-
 import dagger.Module;
 import dagger.Provides;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 @Module
 public class KeyValueServiceModule {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/LockAndTimestampModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/LockAndTimestampModule.java
index d26e30f7b09..7f24c39e47d 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/LockAndTimestampModule.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/LockAndTimestampModule.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.services;
 
-import java.util.function.Supplier;
-
-import javax.inject.Singleton;
-
 import com.palantir.atlasdb.factory.ServiceDiscoveringAtlasSupplier;
 import com.palantir.atlasdb.factory.TransactionManagers;
 import com.palantir.atlasdb.util.MetricsManager;
@@ -27,10 +23,11 @@
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampService;
-
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
+import java.util.function.Supplier;
+import javax.inject.Singleton;
 
 @Module(includes = LockAndTimestampModule.Bindings.class)
 public class LockAndTimestampModule {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/MetricsModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/MetricsModule.java
index 691f4dc2241..acba7aabd1b 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/MetricsModule.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/MetricsModule.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.services;
 
-import javax.inject.Singleton;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
-
 import dagger.Module;
 import dagger.Provides;
+import javax.inject.Singleton;
 
 @Module
 public class MetricsModule {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/RawKeyValueServiceModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/RawKeyValueServiceModule.java
index 08834fe8248..6b032059ccd 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/RawKeyValueServiceModule.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/RawKeyValueServiceModule.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.services;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.util.MetricsManager;
-
 import dagger.Module;
 import dagger.Provides;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 @Module
 public class RawKeyValueServiceModule {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java
index 35bbe226e9d..1c7b01b49fd 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfig.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.services;
 
-import java.util.Optional;
-import java.util.Set;
-
-import javax.net.ssl.SSLSocketFactory;
-
-import org.immutables.value.Value;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.AtlasDbRuntimeConfig;
@@ -29,6 +22,10 @@
 import com.palantir.atlasdb.factory.timestamp.FreshTimestampSupplierAdapter;
 import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.util.MetricsManager;
+import java.util.Optional;
+import java.util.Set;
+import javax.net.ssl.SSLSocketFactory;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class ServicesConfig {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfigModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfigModule.java
index 61d3c201cf1..dfdcc8ae523 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfigModule.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/ServicesConfigModule.java
@@ -15,17 +15,14 @@
  */
 package com.palantir.atlasdb.services;
 
-import java.io.File;
-import java.io.IOException;
-
-import javax.inject.Singleton;
-
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.AtlasDbConfigs;
 import com.palantir.atlasdb.config.AtlasDbRuntimeConfig;
-
 import dagger.Module;
 import dagger.Provides;
+import java.io.File;
+import java.io.IOException;
+import javax.inject.Singleton;
 
 @Module
 public class ServicesConfigModule {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/SweeperModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/SweeperModule.java
index e6ecf215437..7e276a82efb 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/SweeperModule.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/SweeperModule.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.services;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cleaner.Follower;
@@ -32,9 +29,10 @@
 import com.palantir.atlasdb.transaction.impl.SweepStrategyManager;
 import com.palantir.atlasdb.transaction.service.TransactionService;
 import com.palantir.atlasdb.util.MetricsManager;
-
 import dagger.Module;
 import dagger.Provides;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 @Module
 public class SweeperModule {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/TransactionManagerModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/TransactionManagerModule.java
index e90c1cc90fa..0a5b904a98f 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/TransactionManagerModule.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/TransactionManagerModule.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.services;
 
-import java.util.concurrent.Executors;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
@@ -41,9 +36,11 @@
 import com.palantir.common.concurrent.NamedThreadFactory;
 import com.palantir.lock.LockClient;
 import com.palantir.lock.v2.TimelockService;
-
 import dagger.Module;
 import dagger.Provides;
+import java.util.concurrent.Executors;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 @Module
 public class TransactionManagerModule {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestAtlasDbServices.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestAtlasDbServices.java
index e5909b0033a..0afcd8433f2 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestAtlasDbServices.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestAtlasDbServices.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.services.test;
 
-import javax.inject.Singleton;
-
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.services.KeyValueServiceModule;
 import com.palantir.atlasdb.services.LockAndTimestampModule;
@@ -24,8 +22,8 @@
 import com.palantir.atlasdb.services.RawKeyValueServiceModule;
 import com.palantir.atlasdb.services.ServicesConfigModule;
 import com.palantir.lock.LockClient;
-
 import dagger.Component;
+import javax.inject.Singleton;
 
 @Singleton
 @Component(modules = {ServicesConfigModule.class, KeyValueServiceModule.class, RawKeyValueServiceModule.class,
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestSweeperModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestSweeperModule.java
index b6df80d46c2..c364be0771b 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestSweeperModule.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestSweeperModule.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.services.test;
 
-import java.util.Optional;
-import java.util.function.LongSupplier;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cleaner.Follower;
@@ -36,9 +30,12 @@
 import com.palantir.atlasdb.transaction.impl.SweepStrategyManager;
 import com.palantir.atlasdb.transaction.service.TransactionService;
 import com.palantir.atlasdb.util.MetricsManager;
-
 import dagger.Module;
 import dagger.Provides;
+import java.util.Optional;
+import java.util.function.LongSupplier;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 @Module
 public class TestSweeperModule {
diff --git a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestTransactionManagerModule.java b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestTransactionManagerModule.java
index 9483eff02e8..baccf9783ac 100644
--- a/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestTransactionManagerModule.java
+++ b/atlasdb-dagger/src/main/java/com/palantir/atlasdb/services/test/TestTransactionManagerModule.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.services.test;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
@@ -42,9 +39,10 @@
 import com.palantir.lock.LockClient;
 import com.palantir.lock.LockService;
 import com.palantir.timestamp.TimestampService;
-
 import dagger.Module;
 import dagger.Provides;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 @Module
 public class TestTransactionManagerModule {
diff --git a/atlasdb-dagger/src/test/java/com/palantir/atlasdb/services/AtlasDbServicesTest.java b/atlasdb-dagger/src/test/java/com/palantir/atlasdb/services/AtlasDbServicesTest.java
index 30e8e9261bd..ef2212a713a 100644
--- a/atlasdb-dagger/src/test/java/com/palantir/atlasdb/services/AtlasDbServicesTest.java
+++ b/atlasdb-dagger/src/test/java/com/palantir/atlasdb/services/AtlasDbServicesTest.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.services;
 
+import com.palantir.atlasdb.config.AtlasDbConfig;
+import com.palantir.atlasdb.config.AtlasDbConfigs;
+import com.palantir.atlasdb.config.AtlasDbRuntimeConfig;
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
-
 import org.junit.Test;
 
-import com.palantir.atlasdb.config.AtlasDbConfig;
-import com.palantir.atlasdb.config.AtlasDbConfigs;
-import com.palantir.atlasdb.config.AtlasDbRuntimeConfig;
-
 public class AtlasDbServicesTest {
 
     @Test
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/HikariCPConnectionManager.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/HikariCPConnectionManager.java
index 73c43c9a967..35c468ed67b 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/HikariCPConnectionManager.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/HikariCPConnectionManager.java
@@ -15,6 +15,15 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.google.common.base.Stopwatch;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import com.palantir.nexus.db.DBType;
+import com.palantir.nexus.db.pool.config.ConnectionConfig;
+import com.palantir.nexus.db.sql.ExceptionCheck;
+import com.zaxxer.hikari.HikariDataSource;
+import com.zaxxer.hikari.HikariPoolMXBean;
+import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException;
 import java.lang.management.ManagementFactory;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -23,27 +32,15 @@
 import java.util.TimeZone;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
-
 import javax.management.JMX;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Stopwatch;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.logsafe.exceptions.SafeRuntimeException;
-import com.palantir.nexus.db.DBType;
-import com.palantir.nexus.db.pool.config.ConnectionConfig;
-import com.palantir.nexus.db.sql.ExceptionCheck;
-import com.zaxxer.hikari.HikariDataSource;
-import com.zaxxer.hikari.HikariPoolMXBean;
-import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException;
-
 /**
  * HikariCP Connection Manager.
  *
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorConnection.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorConnection.java
index 697b00f5aa2..bb0e30528dd 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorConnection.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorConnection.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.reflect.AbstractInvocationHandler;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -25,10 +28,6 @@
 import java.sql.Statement;
 import java.util.Map;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.reflect.AbstractInvocationHandler;
-
 /**
  * Allows you to intercept and override methods in {@link Connection}.
  */
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorDataSource.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorDataSource.java
index b181c55d893..88623ad13cc 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorDataSource.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorDataSource.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.reflect.AbstractInvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.sql.Connection;
-
 import javax.sql.DataSource;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.reflect.AbstractInvocationHandler;
-
 /**
  * Allows you to intercept and override methods in {@link DataSource}.
  * <p/>
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorStatement.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorStatement.java
index 3dc669b34bd..64d7fdbfdfc 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorStatement.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/InterceptorStatement.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.reflect.AbstractInvocationHandler;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -22,13 +24,9 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.reflect.AbstractInvocationHandler;
-
 /**
  * Allows you to intercept and override methods in {@link Statement} and subinterfaces
  * methods.
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java
index a92a76150af..2b095265d0b 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.nexus.db.pool.config;
 
-import java.sql.Connection;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import javax.sql.DataSource;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.SharedMetricRegistries;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
@@ -34,6 +25,12 @@
 import com.palantir.nexus.db.pool.InterceptorDataSource;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.util.DriverDataSource;
+import java.sql.Connection;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import javax.sql.DataSource;
+import org.immutables.value.Value;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonSubTypes({
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/H2ConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/H2ConnectionConfig.java
index 0a3ef4aae2a..6cfc114bf96 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/H2ConnectionConfig.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/H2ConnectionConfig.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.nexus.db.pool.config;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.nexus.db.DBType;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableH2ConnectionConfig.class)
 @JsonSerialize(as = ImmutableH2ConnectionConfig.class)
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java
index 8756f28aacd..bc0ef6afd65 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.nexus.db.pool.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableMaskedValue.class)
 @JsonSerialize(as = ImmutableMaskedValue.class)
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java
index 2cb062b9e12..2c3b172fe11 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.nexus.db.pool.config;
 
-import java.io.File;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -30,6 +22,12 @@
 import com.google.common.collect.ImmutableMap;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.nexus.db.DBType;
+import java.io.File;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableOracleConnectionConfig.class)
 @JsonSerialize(as = ImmutableOracleConnectionConfig.class)
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java
index 869fbbf46f9..c684b7cb746 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.nexus.db.pool.config;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.nexus.db.DBType;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutablePostgresConnectionConfig.class)
 @JsonSerialize(as = ImmutablePostgresConnectionConfig.class)
diff --git a/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/AbstractDbKvsKeyValueServiceTest.java b/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/AbstractDbKvsKeyValueServiceTest.java
index eed89fd0641..ee6630f7e9d 100644
--- a/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/AbstractDbKvsKeyValueServiceTest.java
+++ b/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/AbstractDbKvsKeyValueServiceTest.java
@@ -17,15 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.stream.Collectors;
-
-import org.junit.After;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
@@ -41,6 +32,13 @@
 import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueServiceTest;
 import com.palantir.atlasdb.keyvalue.impl.KvsManager;
 import com.palantir.common.base.ClosableIterator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.stream.Collectors;
+import org.junit.After;
+import org.junit.Test;
 
 public abstract class AbstractDbKvsKeyValueServiceTest extends AbstractKeyValueServiceTest {
     protected static final Namespace TEST_NAMESPACE = Namespace.create("ns");
diff --git a/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsTestUtils.java b/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsTestUtils.java
index 2665511e0e4..b78c2f05d36 100644
--- a/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsTestUtils.java
+++ b/atlasdb-dbkvs-tests/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsTestUtils.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.DbKvs;
 import com.palantir.atlasdb.transaction.service.TransactionService;
+import java.util.HashMap;
+import java.util.Map;
 
 public final class DbKvsTestUtils {
     private DbKvsTestUtils() {
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsSweepProgressStoreIntegrationTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsSweepProgressStoreIntegrationTest.java
index d174fc3abeb..66ed8a2e86b 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsSweepProgressStoreIntegrationTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKvsSweepProgressStoreIntegrationTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.sweep.progress.AbstractSweepProgressStoreTest;
+import org.junit.ClassRule;
 
 public class DbKvsSweepProgressStoreIntegrationTest extends AbstractSweepProgressStoreTest {
     @ClassRule
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresKeyValueServiceTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresKeyValueServiceTest.java
index ac4cb2da173..73efc6176c1 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresKeyValueServiceTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresKeyValueServiceTest.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import org.apache.commons.lang3.StringUtils;
-import org.junit.After;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres.PostgresDdlTable;
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.After;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class DbkvsPostgresKeyValueServiceTest extends AbstractDbKvsKeyValueServiceTest {
     @ClassRule
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSerializableTransactionTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSerializableTransactionTest.java
index 1cf2c5d3b4b..74b206ab415 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSerializableTransactionTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSerializableTransactionTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.transaction.impl.AbstractSerializableTransactionTest;
+import org.junit.ClassRule;
 
 public class DbkvsPostgresSerializableTransactionTest extends AbstractSerializableTransactionTest {
     @ClassRule
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSweepTaskRunnerTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSweepTaskRunnerTest.java
index a42a38b9a6f..9776e0be31b 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSweepTaskRunnerTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresSweepTaskRunnerTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest;
+import org.junit.ClassRule;
 
 public class DbkvsPostgresSweepTaskRunnerTest extends AbstractSweepTaskRunnerTest {
     @ClassRule
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTargetedSweepIntegrationTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTargetedSweepIntegrationTest.java
index 2579493c1a8..1634844c4e4 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTargetedSweepIntegrationTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTargetedSweepIntegrationTest.java
@@ -16,10 +16,9 @@
 
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.sweep.AbstractTargetedSweepTest;
+import org.junit.ClassRule;
 
 public class DbkvsPostgresTargetedSweepIntegrationTest extends AbstractTargetedSweepTest {
     @ClassRule
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTestSuite.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTestSuite.java
index b3a083f1ec6..853deb4c1a7 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTestSuite.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsPostgresTestSuite.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import java.net.InetSocketAddress;
-import java.util.concurrent.Callable;
-
-import org.awaitility.Awaitility;
-import org.awaitility.Duration;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres.DbKvsPostgresGetCandidateCellsForSweepingTest;
 import com.palantir.conjure.java.api.config.service.HumanReadableDuration;
@@ -37,6 +26,15 @@
 import com.palantir.nexus.db.pool.config.ConnectionConfig;
 import com.palantir.nexus.db.pool.config.ImmutableMaskedValue;
 import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig;
+import java.net.InetSocketAddress;
+import java.util.concurrent.Callable;
+import org.awaitility.Awaitility;
+import org.awaitility.Duration;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
 @SuiteClasses({
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDbTimestampBoundStoreTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDbTimestampBoundStoreTest.java
index 733e443f4e2..42976aa7ae7 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDbTimestampBoundStoreTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDbTimestampBoundStoreTest.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import org.junit.After;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs;
 import com.palantir.atlasdb.keyvalue.dbkvs.timestamp.InDbTimestampBoundStore;
 import com.palantir.atlasdb.timestamp.AbstractDbTimestampBoundStoreTest;
 import com.palantir.timestamp.TimestampBoundStore;
+import org.junit.After;
 
 public class PostgresDbTimestampBoundStoreTest extends AbstractDbTimestampBoundStoreTest {
     private ConnectionManagerAwareDbKvs kvs;
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/DbKvsPostgresGetCandidateCellsForSweepingTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/DbKvsPostgresGetCandidateCellsForSweepingTest.java
index 8e6c55e44b8..bb262f92081 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/DbKvsPostgresGetCandidateCellsForSweepingTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/DbKvsPostgresGetCandidateCellsForSweepingTest.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.dbkvs.DbkvsPostgresTestSuite;
 import com.palantir.atlasdb.keyvalue.impl.AbstractGetCandidateCellsForSweepingTest;
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
+import org.junit.ClassRule;
 
 public class DbKvsPostgresGetCandidateCellsForSweepingTest extends AbstractGetCandidateCellsForSweepingTest {
     @ClassRule
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/nexus/db/pool/HikariCpConnectionManagerTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/nexus/db/pool/HikariCpConnectionManagerTest.java
index c719db45375..cfca357c3c7 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/nexus/db/pool/HikariCpConnectionManagerTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/nexus/db/pool/HikariCpConnectionManagerTest.java
@@ -16,13 +16,20 @@
 
 package com.palantir.nexus.db.pool;
 
+import com.palantir.docker.compose.DockerComposeRule;
+import com.palantir.docker.compose.configuration.ShutdownStrategy;
+import com.palantir.docker.compose.connection.Container;
+import com.palantir.docker.compose.connection.DockerPort;
+import com.palantir.docker.compose.logging.LogDirectory;
+import com.palantir.nexus.db.pool.config.ConnectionConfig;
+import com.palantir.nexus.db.pool.config.ImmutableMaskedValue;
+import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig;
 import java.net.InetSocketAddress;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLTransientConnectionException;
 import java.sql.Statement;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -31,15 +38,6 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.palantir.docker.compose.DockerComposeRule;
-import com.palantir.docker.compose.configuration.ShutdownStrategy;
-import com.palantir.docker.compose.connection.Container;
-import com.palantir.docker.compose.connection.DockerPort;
-import com.palantir.docker.compose.logging.LogDirectory;
-import com.palantir.nexus.db.pool.config.ConnectionConfig;
-import com.palantir.nexus.db.pool.config.ImmutableMaskedValue;
-import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig;
-
 public class HikariCpConnectionManagerTest {
 
     private static final int POSTGRES_PORT_NUMBER = 5432;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java
index ea2bdfb40a6..67de47b46ae 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import java.util.Optional;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.auto.service.AutoService;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -36,6 +29,11 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.PersistentTimestampServiceImpl;
+import java.util.Optional;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @AutoService(AtlasDbFactory.class)
 public class DbAtlasDbFactory implements AtlasDbFactory {
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java
index 21d20023959..c24928653e8 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -27,6 +23,8 @@
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import com.palantir.nexus.db.pool.config.ConnectionConfig;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @AutoService(KeyValueServiceConfig.class)
 @JsonDeserialize(as = ImmutableDbKeyValueServiceConfig.class)
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java
index b9c19826f8a..5956de5671c 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.logsafe.Preconditions;
+import org.immutables.value.Value;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = false)
 @JsonSubTypes({
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java
index 986d6e23e9f..98b38cd73a2 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableH2DdlConfig.class)
 @JsonSerialize(as = ImmutableH2DdlConfig.class)
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java
index 21850ab9497..ab2c36c05d1 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import java.time.Duration;
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -30,6 +24,10 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.OverflowMigrationState;
 import com.palantir.db.oracle.JdbcHandler;
 import com.palantir.logsafe.Preconditions;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableOracleDdlConfig.class)
 @JsonSerialize(as = ImmutableOracleDdlConfig.class)
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapper.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapper.java
index 63c6a60e120..f084353e9e7 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapper.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapper.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import java.util.concurrent.ExecutionException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Iterables;
@@ -30,6 +25,9 @@
 import com.palantir.common.exception.TableMappingNotFoundException;
 import com.palantir.nexus.db.sql.AgnosticResultSet;
 import com.palantir.nexus.db.sql.SqlConnection;
+import java.util.concurrent.ExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class OracleTableNameUnmapper {
     private static final Logger log = LoggerFactory.getLogger(OracleTableNameUnmapper.class);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java
index c90e30718d9..0ce4000acd1 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.conjure.java.api.config.service.HumanReadableDuration;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutablePostgresDdlConfig.class)
 @JsonSerialize(as = ImmutablePostgresDdlConfig.class)
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbQueryFactory.java
index 22cab759622..cb5e68422eb 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbQueryFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbQueryFactory.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
+import com.google.common.base.Joiner;
+import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.google.common.base.Joiner;
-import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
-import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
-
 public abstract class AbstractDbQueryFactory implements DbQueryFactory {
     @Override
     public FullQuery getRowsColumnRangeQuery(
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbWriteTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbWriteTable.java
index 4924dbc38ae..50b626dc318 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbWriteTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbWriteTable.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
@@ -33,6 +28,10 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle.PrimaryKeyConstraintNames;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.ExceptionCheck;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 public abstract class AbstractDbWriteTable implements DbWriteTable {
     protected final DdlConfig config;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java
index ba9904574ce..e5e8c3d3965 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.sql.Connection;
-import java.util.function.Supplier;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.dbkvs.DbKeyValueServiceConfig;
@@ -31,6 +28,8 @@
 import com.palantir.nexus.db.sql.SQL;
 import com.palantir.nexus.db.sql.SqlConnection;
 import com.palantir.nexus.db.sql.SqlConnectionHelper;
+import java.sql.Connection;
+import java.util.function.Supplier;
 
 // This class should be removed and replaced by DbKvs when InDbTimestampStore depends directly on DbKvs
 public final class ConnectionManagerAwareDbKvs extends ForwardingKeyValueService {
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java
index 6c5005b82fe..2bd778a43f6 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
+import com.palantir.nexus.db.sql.SqlConnection;
 import java.sql.SQLException;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.nexus.db.sql.SqlConnection;
-
 public class ConnectionSupplier implements SqlConnectionSupplier {
     private static final Logger log = LoggerFactory.getLogger(ConnectionSupplier.class);
     private volatile SqlConnection sharedConnection;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java
index 3db9dbe9462..7471704c965 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java
@@ -15,41 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Stopwatch;
@@ -134,6 +99,38 @@
 import com.palantir.util.paging.AbstractPagingIterable;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class DbKvs extends AbstractKeyValueService {
     private static final Logger log = LoggerFactory.getLogger(DbKvs.class);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java
index f22fd06d895..356c4372e0b 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.Collection;
-import java.util.Map;
-
 import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import java.util.Collection;
+import java.util.Map;
 
 public interface DbQueryFactory {
     FullQuery getLatestRowQuery(byte[] row, long ts, ColumnSelection columns, boolean includeValue);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java
index 9e0dc6961ac..8b3930c9943 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -33,6 +25,13 @@
 import com.palantir.common.base.ClosableIterators;
 import com.palantir.nexus.db.sql.AgnosticLightResultRow;
 import com.palantir.nexus.db.sql.AgnosticLightResultSet;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 public class DbReadTable {
     private static final int MAX_ROW_COLUMN_RANGES_FETCH_SIZE = 1000;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbTableFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbTableFactory.java
index 2ac990d0967..e57b8b3ca67 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbTableFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbTableFactory.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.io.Closeable;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.nexus.db.DBType;
+import java.io.Closeable;
 
 public interface DbTableFactory extends Closeable {
     DbMetadataTable createMetadata(TableReference tableRef, ConnectionSupplier conns);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbWriteTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbWriteTable.java
index 5ef44ee5ab3..9452f2ee094 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbWriteTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbWriteTable.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete;
 import com.palantir.atlasdb.keyvalue.api.Value;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 public interface DbWriteTable {
     void put(Collection<Map.Entry<Cell, byte[]>> data, long ts);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java
index c645f4eb633..dfc0fbfd7d2 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import java.util.ArrayList;
+import java.util.List;
 
 public class FullQuery {
     private final String query;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java
index 3f2072ea1e6..704527d6cd7 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.concurrent.ExecutorService;
-
 import com.google.common.base.Throwables;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.dbkvs.OracleDdlConfig;
@@ -28,6 +26,7 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle.OracleWriteTable;
 import com.palantir.common.exception.TableMappingNotFoundException;
 import com.palantir.nexus.db.DBType;
+import java.util.concurrent.ExecutorService;
 
 public class OracleDbTableFactory implements DbTableFactory {
     private final OracleDdlConfig config;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValueLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValueLoader.java
index c80900691df..5a76a44a5c5 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValueLoader.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValueLoader.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import java.util.Collection;
 import java.util.Map;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 public interface OverflowValueLoader {
     Map<Long, byte[]> loadOverflowValues(ConnectionSupplier conns,
                                          TableReference tableRef,
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequest.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequest.java
index 0c01d7ed33f..b7c646b8fa7 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequest.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequest.java
@@ -15,18 +15,15 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
+import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.logsafe.Preconditions;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
 import javax.annotation.Nullable;
-
 import org.immutables.value.Value;
 
-import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
-import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
-import com.palantir.logsafe.Preconditions;
-
 /**
  * Represents a batch to load in {@link com.palantir.atlasdb.keyvalue.api.KeyValueService#getRowsColumnRange(
  * com.palantir.atlasdb.keyvalue.api.TableReference, Iterable, ColumnRangeSelection, int, long)}. The overall iteration
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequests.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequests.java
index 8f137b84f1a..78d28caa1e7 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequests.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequests.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.List;
 
 public final class RowsColumnRangeBatchRequests {
     private RowsColumnRangeBatchRequests() {
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java
index f31f9b4fbd6..d35bc82a23b 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.io.Closeable;
-import java.util.function.Supplier;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.SqlConnection;
+import java.io.Closeable;
+import java.util.function.Supplier;
 
 public interface SqlConnectionSupplier extends Supplier<SqlConnection>, Closeable {
     @Override
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableMetadataCache.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableMetadataCache.java
index 914fd258d00..a9bdefd11bb 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableMetadataCache.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableMetadataCache.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
 
 public class TableMetadataCache {
     private static final TableMetadata EMPTY = TableMetadata.allDefault();
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCache.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCache.java
index 0237efeb533..7bba6df7d12 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCache.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCache.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.concurrent.ExecutionException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.cache.Cache;
@@ -28,6 +23,9 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.nexus.db.sql.AgnosticResultSet;
 import com.palantir.nexus.db.sql.SqlConnection;
+import java.util.concurrent.ExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class TableValueStyleCache {
     private static final Logger log = LoggerFactory.getLogger(TableValueStyleCache.class);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TimestampsByCellResultWithToken.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TimestampsByCellResultWithToken.java
index 1f665efcce3..8bbecafc64b 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TimestampsByCellResultWithToken.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TimestampsByCellResultWithToken.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.Arrays;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
@@ -26,6 +24,7 @@
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.nexus.db.sql.AgnosticLightResultRow;
+import java.util.Arrays;
 
 final class TimestampsByCellResultWithToken {
     private byte[] currentRow = null;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/Token.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/Token.java
index 23d5a45d492..58f6a461cc0 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/Token.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/Token.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
 import javax.annotation.Nullable;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UpdateExecutor.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UpdateExecutor.java
index a74a2bde2f0..27300700722 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UpdateExecutor.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UpdateExecutor.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.nexus.db.sql.AgnosticLightResultSet;
 import com.palantir.nexus.db.sql.PalantirSqlConnection;
+import java.util.Arrays;
+import java.util.List;
 
 public class UpdateExecutor {
     private final ConnectionSupplier conns;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClauses.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClauses.java
index 31a4ce01afb..fe969a42048 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClauses.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClauses.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-import java.util.Collection;
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.nexus.db.sql.BasicSQLUtils;
+import java.util.Collection;
+import java.util.List;
 
 public final class WhereClauses {
     private final List<String> clauses;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/AccumulatorStrategies.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/AccumulatorStrategies.java
index b8dad35e55b..09305ea3806 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/AccumulatorStrategies.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/AccumulatorStrategies.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.batch;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
+import java.util.HashMap;
+import java.util.Map;
 
 public final class AccumulatorStrategies {
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/BatchingStrategies.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/BatchingStrategies.java
index df45172ddf9..e87a5bdc5e5 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/BatchingStrategies.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/BatchingStrategies.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.batch;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.palantir.common.collect.Maps2;
+import java.util.List;
+import java.util.Map;
 
 public final class BatchingStrategies {
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/ParallelTaskRunner.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/ParallelTaskRunner.java
index 033eef576c0..ffadbbd5166 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/ParallelTaskRunner.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/batch/ParallelTaskRunner.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.batch;
 
+import com.google.common.base.Throwables;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -22,8 +23,6 @@
 import java.util.concurrent.Future;
 import java.util.function.Function;
 
-import com.google.common.base.Throwables;
-
 public class ParallelTaskRunner implements BatchingTaskRunner {
     private final ExecutorService executor;
     private final int batchSize;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleCellTsPageLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleCellTsPageLoader.java
index dcd557e720f..3a989e73270 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleCellTsPageLoader.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleCellTsPageLoader.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweepingRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
@@ -42,6 +37,10 @@
 import com.palantir.nexus.db.sql.AgnosticLightResultRow;
 import com.palantir.nexus.db.sql.AgnosticLightResultSet;
 import com.palantir.nexus.db.sql.SqlConnection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 
 // Unlike Postgres, Oracle doesn't properly support the "row value" syntax. If we want to start
 // our scan from a given (row_name, col_name, ts) tuple, we can't say
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java
index 883554f767b..0dc993eddf8 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle;
 
-import java.sql.SQLException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Stopwatch;
 import com.google.common.primitives.Ints;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -46,6 +38,12 @@
 import com.palantir.nexus.db.sql.AgnosticResultSet;
 import com.palantir.nexus.db.sql.SqlConnection;
 import com.palantir.util.VersionStrings;
+import java.sql.SQLException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class OracleDdlTable implements DbDdlTable {
     private static final Logger log = LoggerFactory.getLogger(OracleDdlTable.class);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleGetRange.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleGetRange.java
index c4331b53629..1a0e034bf9d 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleGetRange.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleGetRange.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.collect.AbstractIterator;
@@ -55,6 +46,14 @@
 import com.palantir.nexus.db.DBType;
 import com.palantir.nexus.db.sql.AgnosticLightResultRow;
 import com.palantir.nexus.db.sql.AgnosticLightResultSet;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /*
  * 1) When in comes to implementing paging, Oracle is the exact opposite of Postgres:
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowValueLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowValueLoader.java
index 3631778b81c..556f329ea04 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowValueLoader.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowValueLoader.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -37,6 +32,10 @@
 import com.palantir.db.oracle.JdbcHandler.ArrayHandler;
 import com.palantir.nexus.db.sql.AgnosticLightResultRow;
 import com.palantir.nexus.db.sql.AgnosticLightResultSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 public class OracleOverflowValueLoader implements OverflowValueLoader {
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java
index d9df356d2c5..1d8955ed6a5 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle;
 
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
@@ -47,6 +38,13 @@
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.ExceptionCheck;
 import com.palantir.nexus.db.sql.SqlConnection;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class OracleOverflowWriteTable implements DbWriteTable {
     private static final Logger log = LoggerFactory.getLogger(OracleOverflowWriteTable.class);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java
index 2575df1783f..122e95fff7a 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.google.common.base.Joiner;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -32,6 +27,10 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.AbstractDbQueryFactory;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.FullQuery;
 import com.palantir.db.oracle.JdbcHandler.ArrayHandler;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 public class OracleQueryFactory extends AbstractDbQueryFactory {
     private final OracleDdlConfig config;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryHelpers.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryHelpers.java
index ba9f1dfaab6..fcf6c6ff6c9 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryHelpers.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryHelpers.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
+import java.util.List;
 
 public final class OracleQueryHelpers {
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleTableInitializer.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleTableInitializer.java
index 6a1375eac1f..d205ea8dd7c 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleTableInitializer.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleTableInitializer.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.dbkvs.OracleDdlConfig;
 import com.palantir.atlasdb.keyvalue.dbkvs.OracleErrorConstants;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionSupplier;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.DbTableInitializer;
 import com.palantir.exception.PalantirSqlException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class OracleTableInitializer implements DbTableInitializer {
     private static final Logger log = LoggerFactory.getLogger(OracleTableInitializer.class);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java
index c0ebbf9c314..5d450b37f34 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OverflowSequenceSupplier.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionSupplier;
+import java.util.function.Supplier;
 
 public final class OverflowSequenceSupplier implements Supplier<Long> {
     static final int OVERFLOW_ID_CACHE_SIZE = 1000;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresCellTsPageLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresCellTsPageLoader.java
index b58972d79d0..5a26afa91f7 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresCellTsPageLoader.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresCellTsPageLoader.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweepingRequest;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -36,6 +31,10 @@
 import com.palantir.nexus.db.DBType;
 import com.palantir.nexus.db.sql.AgnosticLightResultRow;
 import com.palantir.nexus.db.sql.AgnosticLightResultSet;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 
 public class PostgresCellTsPageLoader implements CellTsPairLoader {
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java
index 3818c180d87..94f0e302a87 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres;
 
-import java.util.concurrent.Semaphore;
-import java.util.function.Predicate;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.helpers.MessageFormatter;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -36,6 +29,11 @@
 import com.palantir.nexus.db.sql.AgnosticResultRow;
 import com.palantir.nexus.db.sql.AgnosticResultSet;
 import com.palantir.nexus.db.sql.ExceptionCheck;
+import java.util.concurrent.Semaphore;
+import java.util.function.Predicate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.MessageFormatter;
 
 public class PostgresDdlTable implements DbDdlTable {
     private static final Logger log = LoggerFactory.getLogger(PostgresDdlTable.class);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresGetRange.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresGetRange.java
index 2568dcb041d..214c0c2a268 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresGetRange.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresGetRange.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterators;
@@ -47,6 +40,12 @@
 import com.palantir.nexus.db.DBType;
 import com.palantir.nexus.db.sql.AgnosticLightResultRow;
 import com.palantir.nexus.db.sql.AgnosticLightResultSet;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 
 /* 1) On Postgres, there seems to be no efficient way to page at atlas row boundaries.
  *    The approach with 'DENSE_RANK() <= x' that works exceptionally well on Oracle,
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java
index 08726f0760f..cb703d01a10 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map.Entry;
-
 import com.google.common.base.Joiner;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -30,6 +26,9 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.PostgresDdlConfig;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.AbstractDbQueryFactory;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.FullQuery;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map.Entry;
 
 public class PostgresQueryFactory extends AbstractDbQueryFactory {
     private final String tableName;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java
index 38c37d16e69..355fa9f9bb8 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionSupplier;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.DbTableInitializer;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle.PrimaryKeyConstraintNames;
 import com.palantir.exception.PalantirSqlException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PostgresTableInitializer implements DbTableInitializer {
     private static final Logger log = LoggerFactory.getLogger(PostgresTableInitializer.class);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresVersionCheck.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresVersionCheck.java
index 5869edb0218..1237a952fb4 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresVersionCheck.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresVersionCheck.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres;
 
-import org.slf4j.Logger;
-
 import com.palantir.util.AssertUtils;
 import com.palantir.util.VersionStrings;
+import org.slf4j.Logger;
 
 public final class PostgresVersionCheck {
     static final String MIN_POSTGRES_VERSION = "9.6";
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRange.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRange.java
index 93bf09359c1..a3aee988014 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRange.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRange.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.ranges;
 
-import java.util.Iterator;
-
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
+import java.util.Iterator;
 
 public interface DbKvsGetRange {
     Iterator<RowResult<Value>> getRange(TableReference tableRef,
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java
index b44e7b2a1e7..93a660f265c 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.ranges;
 
-import java.sql.Connection;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
@@ -65,6 +54,15 @@
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
 import com.palantir.util.timer.LoggingOperationTimer;
+import java.sql.Connection;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DbKvsGetRanges {
     private static final Logger log = LoggerFactory.getLogger(DbKvsGetRanges.class);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelper.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelper.java
index 20113e249f6..66186bb30c1 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelper.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelper.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.ranges;
 
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
 import com.google.common.base.Joiner;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.FullQuery;
 import com.palantir.nexus.db.DBType;
+import java.util.Collection;
+import javax.annotation.Nullable;
 
 public final class RangePredicateHelper {
     private final boolean reverse;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIterator.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIterator.java
index e0e69bf4dba..d1a0aec6530 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIterator.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIterator.java
@@ -15,22 +15,20 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.sweep;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping;
 import com.palantir.logsafe.Preconditions;
-
 import gnu.trove.list.TLongList;
 import gnu.trove.list.array.TLongArrayList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
 
 public final class CandidateGroupingIterator implements Iterator<List<CandidateCellForSweeping>> {
     private final Iterator<List<CellTsPairInfo>> cellTsIterator;
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairLoader.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairLoader.java
index 4dff62639c8..13fabdf9e84 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairLoader.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairLoader.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.sweep;
 
-import java.util.Iterator;
-import java.util.List;
-
 import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweepingRequest;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Iterator;
+import java.util.List;
 
 public interface CellTsPairLoader {
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairToken.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairToken.java
index 41af63c35be..1c3bfc92187 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairToken.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CellTsPairToken.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.sweep;
 
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.logsafe.Preconditions;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class CellTsPairToken {
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/DbKvsGetCandidateCellsForSweeping.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/DbKvsGetCandidateCellsForSweeping.java
index c503fe15f1e..de9b6e2d0ba 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/DbKvsGetCandidateCellsForSweeping.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/DbKvsGetCandidateCellsForSweeping.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.sweep;
 
-import java.util.Iterator;
-import java.util.List;
-
 import com.google.common.collect.Iterators;
 import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
 import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweepingRequest;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Iterator;
+import java.util.List;
 
 public class DbKvsGetCandidateCellsForSweeping {
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java
index bf7a21e0652..765bff1157f 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.timestamp;
 
+import com.palantir.nexus.db.DBType;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.nexus.db.DBType;
-
 public final class ConnectionDbTypes {
     private static final Logger log = LoggerFactory.getLogger(ConnectionDbTypes.class);
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java
index b7bb03a8892..b1e3a5364e6 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.timestamp;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-
-import org.apache.commons.dbutils.QueryRunner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.dbkvs.OracleErrorConstants;
 import com.palantir.common.base.Throwables;
@@ -40,6 +28,15 @@
 import com.palantir.nexus.db.pool.RetriableWriteTransaction;
 import com.palantir.timestamp.MultipleRunningTimestampServiceError;
 import com.palantir.timestamp.TimestampBoundStore;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+import org.apache.commons.dbutils.QueryRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // TODO(hsaraogi): switch to using ptdatabase sql running, which more gracefully supports multiple db types.
 public class InDbTimestampBoundStore implements TimestampBoundStore {
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameMapperTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameMapperTest.java
index 0af6970a50b..6a5293871fe 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameMapperTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameMapperTest.java
@@ -23,11 +23,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -36,6 +31,10 @@
 import com.palantir.nexus.db.sql.AgnosticResultRow;
 import com.palantir.nexus.db.sql.AgnosticResultSet;
 import com.palantir.nexus.db.sql.SqlConnection;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class OracleTableNameMapperTest {
     private static final String TEST_PREFIX = "a_";
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapperTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapperTest.java
index d7803f1de28..467891362db 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapperTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleTableNameUnmapperTest.java
@@ -26,13 +26,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.sql.Connection;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -41,6 +34,11 @@
 import com.palantir.nexus.db.sql.AgnosticResultRow;
 import com.palantir.nexus.db.sql.AgnosticResultSet;
 import com.palantir.nexus.db.sql.SqlConnection;
+import java.sql.Connection;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class OracleTableNameUnmapperTest {
 
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvsPartitionersTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvsPartitionersTest.java
index 91d3eaeb736..2f0c329b143 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvsPartitionersTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvsPartitionersTest.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.keyvalue.dbkvs.util.DbKvsPartitioners;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -22,15 +26,9 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Random;
-
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.palantir.atlasdb.keyvalue.dbkvs.util.DbKvsPartitioners;
-
 public class DbKvsPartitionersTest {
     @Test
     public void testBasic() {
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowSequenceSupplierTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowSequenceSupplierTest.java
index 91b18d2b91b..e360e1b99bb 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowSequenceSupplierTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowSequenceSupplierTest.java
@@ -23,10 +23,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.oracle.OverflowSequenceSupplier;
 import com.palantir.nexus.db.sql.SqlConnection;
+import org.junit.Test;
 
 public class OverflowSequenceSupplierTest {
 
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/PostgresConfigLoadingTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/PostgresConfigLoadingTest.java
index 89529a2ce17..8f48995f724 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/PostgresConfigLoadingTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/PostgresConfigLoadingTest.java
@@ -21,17 +21,15 @@
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.AtlasDbConfigs;
 import com.palantir.atlasdb.keyvalue.dbkvs.DbKeyValueServiceConfig;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import com.palantir.nexus.db.pool.config.ConnectionConfig;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import org.junit.Test;
 
 public class PostgresConfigLoadingTest {
     @Test
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequestsTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequestsTest.java
index c4555311d9b..e76d34c4154 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequestsTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/RowsColumnRangeBatchRequestsTest.java
@@ -15,21 +15,19 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
+import com.google.common.primitives.Ints;
+import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.google.common.primitives.Ints;
-import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
-import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
-
 @RunWith(Parameterized.class)
 public class RowsColumnRangeBatchRequestsTest {
     private final boolean hasPartialFirstRow;
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCacheTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCacheTest.java
index e2067b89790..2c2bc3bbb5b 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCacheTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableValueStyleCacheTest.java
@@ -26,18 +26,16 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.sql.Connection;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.nexus.db.sql.AgnosticResultRow;
 import com.palantir.nexus.db.sql.AgnosticResultSet;
 import com.palantir.nexus.db.sql.SqlConnection;
+import java.sql.Connection;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class TableValueStyleCacheTest {
     private static final TableReference TEST_TABLE = TableReference.createFromFullyQualifiedName("ns.test_table");
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClausesTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClausesTest.java
index 00f546809e4..54ef51cd4f2 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClausesTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/WhereClausesTest.java
@@ -18,14 +18,12 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
-import java.util.List;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import java.util.List;
+import org.junit.Test;
 
 public class WhereClausesTest {
     private static final byte[] COL1 = PtBytes.toBytes("col1");
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTableTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTableTest.java
index 1de445aca47..f70ae99daa1 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTableTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTableTest.java
@@ -26,14 +26,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.dbkvs.ImmutablePostgresDdlConfig;
@@ -43,6 +35,12 @@
 import com.palantir.nexus.db.DBType;
 import com.palantir.nexus.db.sql.AgnosticResultSetImpl;
 import com.palantir.nexus.db.sql.SqlConnection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
 
 public class PostgresDdlTableTest {
     private PostgresDdlTable postgresDdlTable;
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelperTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelperTest.java
index 873d1555a51..6eb5f97abe6 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelperTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/RangePredicateHelperTest.java
@@ -21,12 +21,11 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.FullQuery;
 import com.palantir.nexus.db.DBType;
+import org.junit.Test;
 
 public class RangePredicateHelperTest {
     private static final byte[] ROW_NAME = {1, 2, 3 };
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIteratorTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIteratorTest.java
index 05705b74754..c4799ae50f2 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIteratorTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/sweep/CandidateGroupingIteratorTest.java
@@ -19,19 +19,17 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping;
-
 public class CandidateGroupingIteratorTest {
 
     @Rule
diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/ete/Gradle.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/ete/Gradle.java
index d39220df357..24474db136e 100644
--- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/ete/Gradle.java
+++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/ete/Gradle.java
@@ -23,7 +23,6 @@
 import java.io.InputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
 import org.apache.commons.io.IOUtils;
 import org.junit.rules.ExternalResource;
 
diff --git a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java
index 2b98847a621..a035f0360ff 100644
--- a/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java
+++ b/atlasdb-ete-test-utils/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.todo;
 
-import java.io.File;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
@@ -28,6 +26,7 @@
 import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
+import java.io.File;
 
 public class TodoSchema implements AtlasSchema {
     private static final Schema INDEX_TEST_SCHEMA = generateSchema();
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java
index 627632254bf..19b283c74e8 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.atlasdb;
 
-import java.util.Optional;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.AtlasDbRuntimeConfig;
-
 import io.dropwizard.Configuration;
+import java.util.Optional;
 
 public class AtlasDbEteConfiguration extends Configuration {
     private final AtlasDbConfig atlasdb;
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java
index 9fbd0be3bba..7bc147c8688 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb;
 
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.SharedMetricRegistries;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -64,12 +55,18 @@
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
-
 import io.dropwizard.Application;
 import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
 import io.dropwizard.configuration.SubstitutingSourceProvider;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AtlasDbEteServer extends Application<AtlasDbEteConfiguration> {
     private static final Logger log = LoggerFactory.getLogger(AtlasDbEteServer.class);
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/BlobSchema.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/BlobSchema.java
index 31cea825f8c..67d4da19d49 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/BlobSchema.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/blob/BlobSchema.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.blob;
 
-import java.io.File;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.schema.AtlasSchema;
@@ -28,6 +23,9 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.logsafe.UnsafeArg;
+import java.io.File;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BlobSchema implements AtlasSchema {
     private static final Logger log = LoggerFactory.getLogger(BlobSchema.class);
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/coordination/CoordinationResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/coordination/CoordinationResource.java
index 272babf43e9..3e66f4d8c7c 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/coordination/CoordinationResource.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/coordination/CoordinationResource.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.coordination;
 
+import com.palantir.atlasdb.internalschema.InternalSchemaMetadata;
+import com.palantir.processors.AutoDelegate;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.atlasdb.internalschema.InternalSchemaMetadata;
-import com.palantir.processors.AutoDelegate;
-
 @AutoDelegate
 @Path("/coordination")
 public interface CoordinationResource {
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/lock/SimpleLockResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/lock/SimpleLockResource.java
index 13b19feb6ab..64c1550013f 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/lock/SimpleLockResource.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/lock/SimpleLockResource.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.lock;
 
-import java.security.SecureRandom;
-import java.util.Comparator;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
@@ -33,6 +25,13 @@
 import com.palantir.lock.LockRefreshToken;
 import com.palantir.lock.v2.LockRequest;
 import com.palantir.lock.v2.LockResponse;
+import java.security.SecureRandom;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 public class SimpleLockResource implements LockResource {
     private static final SecureRandom GENERATOR = new SecureRandom();
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/timestamp/EteTimestampResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/timestamp/EteTimestampResource.java
index 6a6766bf2b1..9e7de3d00da 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/timestamp/EteTimestampResource.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/timestamp/EteTimestampResource.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.timestamp;
 
+import com.palantir.logsafe.Safe;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.logsafe.Safe;
-
 /**
  * ETE wrapper around a Timestamp service and a TimestampManagement service.
  */
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/SimpleTodoResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/SimpleTodoResource.java
index 9cfe92c2f62..c8c2ae1d2a3 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/SimpleTodoResource.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/SimpleTodoResource.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.todo;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.List;
-
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.logsafe.Preconditions;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
 
 public class SimpleTodoResource implements TodoResource {
     private TodoClient atlas;
@@ -107,4 +106,3 @@ public boolean namespacedTodoDoesNotExistBeforeTimestamp(long id, long timestamp
         return atlas.namespacedTodoDoesNotExistBeforeTimestamp(id, timestamp, namespace);
     }
 }
-
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/Todo.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/Todo.java
index 55ba5687834..cf9c59f2d9c 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/Todo.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/Todo.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.todo;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableTodo.class)
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java
index a8c0ea28b37..356acd642e7 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java
@@ -15,19 +15,6 @@
  */
 package com.palantir.atlasdb.todo;
 
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -62,6 +49,17 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.util.Pair;
 import com.palantir.util.crypto.Sha256Hash;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TodoClient {
     private static final Logger log = LoggerFactory.getLogger(TodoClient.class);
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoResource.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoResource.java
index a8a105eaeae..64d64799877 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoResource.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoResource.java
@@ -15,8 +15,9 @@
  */
 package com.palantir.atlasdb.todo;
 
+import com.palantir.atlasdb.keyvalue.api.SweepResults;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import java.util.List;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -25,9 +26,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.atlasdb.keyvalue.api.SweepResults;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 @Path("/todos")
 public interface TodoResource {
     @POST
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraMultinodeTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraMultinodeTestSuite.java
index 0b015285330..e999435ec5e 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraMultinodeTestSuite.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraMultinodeTestSuite.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.ete;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.containers.CassandraEnvironment;
+import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
+import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest;
 import java.util.List;
-
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.containers.CassandraEnvironment;
-import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
-import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
         TodoEteTest.class,
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraNoLeaderTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraNoLeaderTestSuite.java
index 29f81888518..735e6477e10 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraNoLeaderTestSuite.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraNoLeaderTestSuite.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.ete;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.containers.CassandraEnvironment;
+import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
+import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest;
 import java.util.List;
-
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.containers.CassandraEnvironment;
-import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
-import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
         TodoEteTest.class,
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimeLockTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimeLockTestSuite.java
index dbd7476b0ef..ef8d2801df3 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimeLockTestSuite.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimeLockTestSuite.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.ete;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.containers.CassandraEnvironment;
+import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
+import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest;
 import java.util.List;
-
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.containers.CassandraEnvironment;
-import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
-import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
         TodoEteTest.class,
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimestampsEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimestampsEteTest.java
index dbb17dc49f6..ce434a4211a 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimestampsEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/CassandraTimestampsEteTest.java
@@ -17,6 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.ete.cassandra.util.CassandraCommands;
+import com.palantir.atlasdb.table.description.ValueType;
+import com.palantir.atlasdb.todo.ImmutableTodo;
+import com.palantir.atlasdb.todo.Todo;
+import com.palantir.atlasdb.todo.TodoResource;
+import com.palantir.atlasdb.todo.TodoSchema;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -25,20 +32,11 @@
 import java.util.function.BooleanSupplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.awaitility.Awaitility;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Iterables;
-import com.palantir.atlasdb.ete.cassandra.util.CassandraCommands;
-import com.palantir.atlasdb.table.description.ValueType;
-import com.palantir.atlasdb.todo.ImmutableTodo;
-import com.palantir.atlasdb.todo.Todo;
-import com.palantir.atlasdb.todo.TodoResource;
-import com.palantir.atlasdb.todo.TodoSchema;
-
 public class CassandraTimestampsEteTest {
     private static final Todo TODO = ImmutableTodo.of("todo");
     private static final Todo TODO_2 = ImmutableTodo.of("todo_two");
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DbKvsTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DbKvsTestSuite.java
index aaaec5f4378..05b7840d899 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DbKvsTestSuite.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DbKvsTestSuite.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.ete;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
 import java.util.List;
-
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
         TodoEteTest.class,
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DockerClientOrchestrationRule.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DockerClientOrchestrationRule.java
index ba31139997e..533f4a4c229 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DockerClientOrchestrationRule.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/DockerClientOrchestrationRule.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.ete;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Map;
-
-import org.apache.commons.io.FileUtils;
-import org.joda.time.Duration;
-import org.junit.rules.ExternalResource;
-import org.junit.rules.TemporaryFolder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.containers.CassandraEnvironment;
@@ -40,6 +28,16 @@
 import com.palantir.docker.compose.execution.ImmutableDockerComposeExecArgument;
 import com.palantir.docker.compose.logging.LogDirectory;
 import com.palantir.docker.proxy.DockerProxyRule;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+import org.apache.commons.io.FileUtils;
+import org.joda.time.Duration;
+import org.junit.rules.ExternalResource;
+import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DockerClientOrchestrationRule extends ExternalResource {
     private static final Logger log = LoggerFactory.getLogger(DockerClientOrchestrationRule.class);
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java
index 1b4abc1731a..72dd7a21452 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java
@@ -15,20 +15,6 @@
  */
 package com.palantir.atlasdb.ete;
 
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.Callable;
-import java.util.stream.Collectors;
-
-import org.awaitility.Awaitility;
-import org.awaitility.Duration;
-import org.junit.rules.ExternalResource;
-import org.junit.rules.RuleChain;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -48,6 +34,18 @@
 import com.palantir.docker.compose.execution.DockerComposeExecOption;
 import com.palantir.docker.compose.logging.LogDirectory;
 import com.palantir.docker.proxy.DockerProxyRule;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+import org.awaitility.Awaitility;
+import org.awaitility.Duration;
+import org.junit.rules.ExternalResource;
+import org.junit.rules.RuleChain;
 
 // Important: Some internal tests depend on this class.
 // Please recompile Oracle internal tests if any breaking changes are made to the setup.
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithTimelockEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithTimelockEteTest.java
index 14cd41bce7e..8f95a97bf8f 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithTimelockEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithTimelockEteTest.java
@@ -18,9 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.lock.LockResource;
+import org.junit.Test;
 
 public class LockWithTimelockEteTest {
     private LockResource lockResource = EteSetup.createClientToSingleNode(LockResource.class);
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithoutTimelockEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithoutTimelockEteTest.java
index c0b676ad736..44356d4dbfc 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithoutTimelockEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/LockWithoutTimelockEteTest.java
@@ -18,9 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.lock.LockResource;
+import org.junit.Test;
 
 public class LockWithoutTimelockEteTest {
     private LockResource lockResource = EteSetup.createClientToSingleNode(LockResource.class);
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraDoubleNodeDownEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraDoubleNodeDownEteTest.java
index b248d97313a..3e9723c0a34 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraDoubleNodeDownEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraDoubleNodeDownEteTest.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.ete;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.todo.ImmutableTodo;
+import com.palantir.atlasdb.todo.Todo;
+import com.palantir.atlasdb.todo.TodoResource;
 import java.util.List;
 import java.util.UUID;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.todo.ImmutableTodo;
-import com.palantir.atlasdb.todo.Todo;
-import com.palantir.atlasdb.todo.TodoResource;
-
 public class MultiCassandraDoubleNodeDownEteTest {
     private static final List<String> CASSANDRA_NODES_TO_KILL = ImmutableList.of("cassandra1", "cassandra2");
 
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraSingleNodeDownEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraSingleNodeDownEteTest.java
index 1ebbaa84fd7..b01ff9335fd 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraSingleNodeDownEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraSingleNodeDownEteTest.java
@@ -17,20 +17,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.todo.ImmutableTodo;
+import com.palantir.atlasdb.todo.Todo;
+import com.palantir.atlasdb.todo.TodoResource;
+import com.palantir.flake.FlakeRetryingRule;
+import com.palantir.flake.ShouldRetry;
 import java.util.UUID;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
-import com.palantir.atlasdb.todo.ImmutableTodo;
-import com.palantir.atlasdb.todo.Todo;
-import com.palantir.atlasdb.todo.TodoResource;
-import com.palantir.flake.FlakeRetryingRule;
-import com.palantir.flake.ShouldRetry;
-
 @ShouldRetry // In some cases we obtain a TTransportException from Cassandra, probably because we don't wait enough?
 public class MultiCassandraSingleNodeDownEteTest {
     private static final String CASSANDRA_NODE_TO_KILL = "cassandra1";
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraTestSuite.java
index cb10f4b3651..7fed41a1e11 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraTestSuite.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraTestSuite.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.ete;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.containers.CassandraEnvironment;
+import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
+import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest;
 import java.util.List;
-
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.containers.CassandraEnvironment;
-import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
-import com.palantir.atlasdb.ete.coordination.MultipleSchemaVersionsCoordinationEteTest;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
         TodoEteTest.class,
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraUtils.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraUtils.java
index cd78d4b8735..3e55c5b79f7 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraUtils.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/MultiCassandraUtils.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.ete;
 
+import com.google.common.base.Throwables;
+import com.palantir.docker.compose.connection.Container;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
-
 import org.awaitility.Awaitility;
 
-import com.google.common.base.Throwables;
-import com.palantir.docker.compose.connection.Container;
-
 public final class MultiCassandraUtils {
     private static final int CASSANDRA_PORT = 9160;
 
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/PostgresDbPersistenceTimeLockTestSuite.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/PostgresDbPersistenceTimeLockTestSuite.java
index 8f7dc3c3ee1..68543da09a6 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/PostgresDbPersistenceTimeLockTestSuite.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/PostgresDbPersistenceTimeLockTestSuite.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.ete;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
 import java.util.List;
-
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.ete.coordination.CoordinationEteTest;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
         TodoEteTest.class,
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/ServiceExposureEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/ServiceExposureEteTest.java
index 0f050f06cb1..1f99ccb0cc0 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/ServiceExposureEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/ServiceExposureEteTest.java
@@ -21,10 +21,9 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import org.junit.Test;
 
 public class ServiceExposureEteTest {
     @Test
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/StreamTestUtils.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/StreamTestUtils.java
index cc47104aaef..f005db7cac0 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/StreamTestUtils.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/StreamTestUtils.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.ete;
 
-import java.util.Random;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.todo.TodoResource;
+import java.util.Random;
 
 public final class StreamTestUtils {
     private StreamTestUtils() {
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TargetedSweepEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TargetedSweepEteTest.java
index 484987a75b1..3511471728a 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TargetedSweepEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TargetedSweepEteTest.java
@@ -18,20 +18,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
-import java.util.concurrent.TimeUnit;
-
-import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.todo.ImmutableTodo;
 import com.palantir.atlasdb.todo.Todo;
 import com.palantir.atlasdb.todo.TodoResource;
 import com.palantir.atlasdb.todo.generated.TodoSchemaTableFactory;
+import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
 
 public class TargetedSweepEteTest {
     private static final Todo TODO = ImmutableTodo.of("some stuff to do");
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimeLockMigrationEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimeLockMigrationEteTest.java
index 0f5ebd0726d..98e5c5479e6 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimeLockMigrationEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimeLockMigrationEteTest.java
@@ -17,10 +17,17 @@
 
 import static org.assertj.core.api.Assertions.catchThrowable;
 
+import com.palantir.atlasdb.http.AtlasDbHttpClients;
+import com.palantir.atlasdb.http.TestProxyUtils;
+import com.palantir.atlasdb.http.errors.AtlasDbRemoteException;
+import com.palantir.atlasdb.todo.ImmutableTodo;
+import com.palantir.atlasdb.todo.Todo;
+import com.palantir.atlasdb.todo.TodoResource;
+import com.palantir.atlasdb.util.MetricsManagers;
+import com.palantir.timestamp.TimestampService;
 import java.io.File;
 import java.util.Optional;
 import java.util.concurrent.Callable;
-
 import org.assertj.core.api.JUnitSoftAssertions;
 import org.awaitility.Awaitility;
 import org.awaitility.Duration;
@@ -31,15 +38,6 @@
 import org.junit.rules.RuleChain;
 import org.junit.rules.TemporaryFolder;
 
-import com.palantir.atlasdb.http.AtlasDbHttpClients;
-import com.palantir.atlasdb.http.TestProxyUtils;
-import com.palantir.atlasdb.http.errors.AtlasDbRemoteException;
-import com.palantir.atlasdb.todo.ImmutableTodo;
-import com.palantir.atlasdb.todo.Todo;
-import com.palantir.atlasdb.todo.TodoResource;
-import com.palantir.atlasdb.util.MetricsManagers;
-import com.palantir.timestamp.TimestampService;
-
 // We don't use EteSetup because we need much finer-grained control of the orchestration here, compared to the other
 // ETE tests where the general idea is "set up all the containers, and fire".
 public class TimeLockMigrationEteTest {
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimestampManagementEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimestampManagementEteTest.java
index 81a2c7c6ae8..64198e3ca79 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimestampManagementEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TimestampManagementEteTest.java
@@ -21,9 +21,8 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.timestamp.EteTimestampResource;
+import org.junit.Test;
 
 public class TimestampManagementEteTest {
 
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java
index c66315b8640..14810a619a8 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java
@@ -19,19 +19,17 @@
 import static org.hamcrest.Matchers.hasItem;
 import static org.junit.Assert.assertThat;
 
-import java.net.SocketTimeoutException;
-
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
 import com.palantir.atlasdb.todo.ImmutableTodo;
 import com.palantir.atlasdb.todo.Todo;
 import com.palantir.atlasdb.todo.TodoResource;
 import com.palantir.flake.FlakeRetryingRule;
 import com.palantir.flake.ShouldRetry;
+import java.net.SocketTimeoutException;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
 
 public class TodoEteTest {
     private static final Todo TODO = ImmutableTodo.of("some stuff to do");
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/cassandra/util/CassandraCommands.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/cassandra/util/CassandraCommands.java
index bb463ac9e47..095c6d32a01 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/cassandra/util/CassandraCommands.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/cassandra/util/CassandraCommands.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.ete.cassandra.util;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.google.common.io.BaseEncoding;
 import com.palantir.atlasdb.ete.EteSetup;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public final class CassandraCommands {
     private CassandraCommands() {
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/CoordinationEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/CoordinationEteTest.java
index 48cb507f181..5cfed8718fa 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/CoordinationEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/CoordinationEteTest.java
@@ -18,11 +18,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.atlasdb.coordination.CoordinationResource;
 import com.palantir.atlasdb.ete.EteSetup;
+import org.junit.Before;
+import org.junit.Test;
 
 public class CoordinationEteTest {
     private static final int VERSION_ONE = 1;
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/MultipleSchemaVersionsCoordinationEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/MultipleSchemaVersionsCoordinationEteTest.java
index fc2273eb4a0..e44df402cd4 100644
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/MultipleSchemaVersionsCoordinationEteTest.java
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/coordination/MultipleSchemaVersionsCoordinationEteTest.java
@@ -18,10 +18,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.coordination.CoordinationResource;
 import com.palantir.atlasdb.ete.EteSetup;
+import org.junit.Test;
 
 public class MultipleSchemaVersionsCoordinationEteTest {
     private static final int VERSION_ONE = 1;
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbErrorDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbErrorDecoder.java
index 78a1d9f13ce..9cd3ec57b43 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbErrorDecoder.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbErrorDecoder.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.util.Collection;
-import java.util.Date;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.net.HttpHeaders;
 import com.palantir.common.remoting.HeaderAccessUtils;
-
 import feign.Response;
 import feign.RetryableException;
 import feign.codec.ErrorDecoder;
+import java.util.Collection;
+import java.util.Date;
 
 public class AtlasDbErrorDecoder implements ErrorDecoder {
     private ErrorDecoder delegateDecoder = new SerializableErrorDecoder();
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java
index 4372994ce9c..f1413c156ac 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.SocketAddress;
-import java.net.URI;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Supplier;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -43,7 +31,6 @@
 import com.palantir.conjure.java.config.ssl.TrustContext;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.util.CachedTransformingSupplier;
-
 import feign.Client;
 import feign.Contract;
 import feign.Feign;
@@ -53,6 +40,17 @@
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 import feign.jaxrs.JAXRSContract;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 public final class AtlasDbFeignTargetFactory implements TargetFactory {
     // add some padding to the feign timeout, as in many cases lock requests default to a 60 second timeout,
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbInterceptors.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbInterceptors.java
index 623885df345..d55525a2a8b 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbInterceptors.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbInterceptors.java
@@ -16,12 +16,10 @@
 
 package com.palantir.atlasdb.http;
 
-import java.io.IOException;
-
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
+import java.io.IOException;
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.RequestBody;
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonDecoder.java
index 1a07317caf6..47d9863e41f 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonDecoder.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonDecoder.java
@@ -23,17 +23,15 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Type;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.RuntimeJsonMappingException;
-
 import feign.Response;
 import feign.Util;
 import feign.codec.Decoder;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Type;
 
 class AtlasDbJacksonDecoder implements Decoder {
     private final ObjectMapper mapper;
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonEncoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonEncoder.java
index 1896d28c39f..5cfe94c9f9e 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonEncoder.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbJacksonEncoder.java
@@ -22,16 +22,14 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import feign.RequestTemplate;
 import feign.codec.EncodeException;
 import feign.codec.Encoder;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
 
 class AtlasDbJacksonEncoder implements Encoder {
     private final ObjectMapper mapper;
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/CounterBackedRefreshingClient.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/CounterBackedRefreshingClient.java
index 050061954de..c97f47da149 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/CounterBackedRefreshingClient.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/CounterBackedRefreshingClient.java
@@ -15,19 +15,16 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.logsafe.SafeArg;
-
 import feign.Client;
 import feign.Request;
 import feign.Response;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CounterBackedRefreshingClient implements Client {
     private static final Logger log = LoggerFactory.getLogger(CounterBackedRefreshingClient.class);
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClient.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClient.java
index 2adc1e0e150..20b639a2efa 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClient.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClient.java
@@ -15,19 +15,16 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.logsafe.SafeArg;
-
 import feign.Client;
 import feign.Request;
 import feign.Response;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ExceptionCountingRefreshingClient implements Client {
     private static final Logger log = LoggerFactory.getLogger(ExceptionCountingRefreshingClient.class);
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionRetryBehaviour.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionRetryBehaviour.java
index 956285dc23a..439f13a52b2 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionRetryBehaviour.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/ExceptionRetryBehaviour.java
@@ -17,7 +17,6 @@
 
 import com.palantir.atlasdb.http.errors.AtlasDbRemoteException;
 import com.palantir.lock.remoting.BlockingTimeoutException;
-
 import feign.RetryableException;
 
 public enum ExceptionRetryBehaviour {
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java
index 57532205cb9..115281790c9 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java
@@ -15,26 +15,12 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.time.Duration;
-import java.util.Collection;
-import java.util.Optional;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.common.time.Clock;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import feign.Client;
 import feign.Request;
@@ -43,6 +29,17 @@
 import feign.RetryableException;
 import feign.Retryer;
 import feign.Target;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FailoverFeignTarget<T> implements Target<T>, Retryer {
     private static final Logger log = LoggerFactory.getLogger(FailoverFeignTarget.class);
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FeignOkHttpClients.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FeignOkHttpClients.java
index d6611ce85fc..9385b7964f5 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FeignOkHttpClients.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/FeignOkHttpClients.java
@@ -15,22 +15,19 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.net.ProxySelector;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import javax.net.ssl.SSLSocketFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.config.AuxiliaryRemotingParameters;
 import com.palantir.conjure.java.api.config.service.UserAgents;
 import com.palantir.conjure.java.config.ssl.TrustContext;
-
 import feign.Client;
 import feign.okhttp.OkHttpClient;
+import java.net.ProxySelector;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import javax.net.ssl.SSLSocketFactory;
 import okhttp3.CipherSuite;
 import okhttp3.ConnectionPool;
 import okhttp3.ConnectionSpec;
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/InterruptHonoringRetryer.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/InterruptHonoringRetryer.java
index a81e507153b..3443bc12a32 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/InterruptHonoringRetryer.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/InterruptHonoringRetryer.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.io.InterruptedIOException;
-
 import feign.RetryableException;
 import feign.Retryer;
+import java.io.InterruptedIOException;
 
 /**
  * Simple wrapper around the default Feign retryer that propagates {@link InterruptedIOException}s
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/OptionalAwareDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/OptionalAwareDecoder.java
index 106fd5dda17..244cb230d50 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/OptionalAwareDecoder.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/OptionalAwareDecoder.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.http;
 
+import feign.FeignException;
+import feign.Response;
+import feign.codec.Decoder;
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Optional;
 
-import feign.FeignException;
-import feign.Response;
-import feign.codec.Decoder;
-
 public class OptionalAwareDecoder implements Decoder {
     private final Decoder delegate;
 
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/RsErrorDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/RsErrorDecoder.java
index c608213e3c9..d205e62f03b 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/RsErrorDecoder.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/RsErrorDecoder.java
@@ -15,10 +15,12 @@
  */
 package com.palantir.atlasdb.http;
 
+import com.google.common.io.CharStreams;
+import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import feign.codec.ErrorDecoder;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map.Entry;
-
 import javax.ws.rs.BadRequestException;
 import javax.ws.rs.ClientErrorException;
 import javax.ws.rs.ForbiddenException;
@@ -34,11 +36,6 @@
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 
-import com.google.common.io.CharStreams;
-import com.palantir.logsafe.exceptions.SafeRuntimeException;
-
-import feign.codec.ErrorDecoder;
-
 class RsErrorDecoder implements ErrorDecoder {
     @Override
     public RuntimeException decode(String methodKey, feign.Response feignResponse) {
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/SerializableErrorDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/SerializableErrorDecoder.java
index ec61813aebe..d611e95feb0 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/SerializableErrorDecoder.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/SerializableErrorDecoder.java
@@ -15,20 +15,17 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.net.HttpHeaders;
 import com.palantir.atlasdb.http.errors.AtlasDbRemoteException;
 import com.palantir.common.remoting.HeaderAccessUtils;
 import com.palantir.remoting2.errors.RemoteException;
 import com.palantir.remoting2.errors.SerializableErrorToExceptionConverter;
-
 import feign.Response;
 import feign.codec.ErrorDecoder;
+import java.io.IOException;
+import java.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SerializableErrorDecoder implements ErrorDecoder {
     private static final Logger log = LoggerFactory.getLogger(SerializableErrorDecoder.class);
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java
index b3b5fe89694..8bb5d12ce6f 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java
@@ -29,18 +29,15 @@
 
 package com.palantir.atlasdb.http;
 
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import javax.ws.rs.core.MediaType;
-
 import com.google.common.net.HttpHeaders;
 import com.palantir.common.remoting.HeaderAccessUtils;
-
 import feign.FeignException;
 import feign.Response;
 import feign.codec.Decoder;
 import feign.codec.StringDecoder;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import javax.ws.rs.core.MediaType;
 
 /**
  * If the response has a Content-Type of text/plain, then this decoder uses a string decoder.
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/UserAgents.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/UserAgents.java
index 974b4f84db2..48234d61475 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/UserAgents.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/UserAgents.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.util.Optional;
-
 import com.google.common.annotations.VisibleForTesting;
+import java.util.Optional;
 
 public final class UserAgents {
     private static final String ATLASDB_CLIENT = "atlasdb";
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteException.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteException.java
index caac94defd4..05a69abe47a 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteException.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteException.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.http.errors;
 
+import com.palantir.remoting2.errors.RemoteException;
+import com.palantir.remoting2.errors.SerializableStackTraceElement;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nullable;
 
-import com.palantir.remoting2.errors.RemoteException;
-import com.palantir.remoting2.errors.SerializableStackTraceElement;
-
 /**
  * An AtlasDbRemoteException is a wrapper around a http-remoting RemoteException.
  *
@@ -51,7 +49,8 @@ public String getErrorName() {
         return remoteException.getRemoteException().getErrorName();
     }
 
-    // Cannot be named getStackTrace() because that is a method on RuntimeException that returns a list of

+    // Cannot be named getStackTrace() because that is a method on RuntimeException that returns a list of
+
     // (non-serializable) StackTraceElements.
     @Nullable // For consistency with HTTP-Remoting API
     public List<AtlasDbStackTraceElement> getRemoteStackTrace() {
diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElement.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElement.java
index a461697dfe4..d8431930953 100644
--- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElement.java
+++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElement.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.http.errors;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.remoting2.errors.SerializableStackTraceElement;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableAtlasDbStackTraceElement.class)
 @JsonSerialize(as = ImmutableAtlasDbStackTraceElement.class)
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/AtlasDbErrorDecoderTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/AtlasDbErrorDecoderTest.java
index a6ff117666e..7955c4cbdba 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/AtlasDbErrorDecoderTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/AtlasDbErrorDecoderTest.java
@@ -22,20 +22,17 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.HttpHeaders;
-
 import feign.Response;
 import feign.RetryableException;
 import feign.codec.ErrorDecoder;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AtlasDbErrorDecoderTest {
     private static final String EMPTY_METHOD_KEY = "";
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/CounterBackedRefreshingClientTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/CounterBackedRefreshingClientTest.java
index 91923998765..800f6345687 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/CounterBackedRefreshingClientTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/CounterBackedRefreshingClientTest.java
@@ -21,16 +21,13 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.io.IOException;
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
-
 import feign.Client;
 import feign.Request;
 import feign.Response;
+import java.io.IOException;
+import java.util.function.Supplier;
+import org.junit.Test;
 
 public class CounterBackedRefreshingClientTest {
     @SuppressWarnings("unchecked") // For testing, and we can configure the return types appropriately.
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClientTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClientTest.java
index d46902ae902..ccc5d10f5fa 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClientTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionCountingRefreshingClientTest.java
@@ -21,16 +21,13 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.io.IOException;
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
-
 import feign.Client;
 import feign.Request;
 import feign.Response;
+import java.io.IOException;
+import java.util.function.Supplier;
+import org.junit.Test;
 
 public class ExceptionCountingRefreshingClientTest {
     private Supplier<Client> clientSupplier = (Supplier<Client>) mock(Supplier.class);
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionRetryBehaviourTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionRetryBehaviourTest.java
index 1951ebc0e72..64e79a92dbf 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionRetryBehaviourTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/ExceptionRetryBehaviourTest.java
@@ -17,18 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.time.Instant;
-import java.util.Date;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.http.errors.AtlasDbRemoteException;
 import com.palantir.common.remoting.ServiceNotAvailableException;
 import com.palantir.lock.remoting.BlockingTimeoutException;
 import com.palantir.remoting2.errors.RemoteException;
 import com.palantir.remoting2.errors.SerializableError;
-
 import feign.RetryableException;
+import java.time.Instant;
+import java.util.Date;
+import org.junit.Test;
 
 @SuppressWarnings("ThrowableResultOfMethodCallIgnored") // We need to create exceptions for testing.
 public class ExceptionRetryBehaviourTest {
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FailoverFeignTargetTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FailoverFeignTargetTest.java
index 314506e2121..576eff16dec 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FailoverFeignTargetTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FailoverFeignTargetTest.java
@@ -30,25 +30,22 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.hamcrest.MockitoHamcrest.longThat;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.http.errors.AtlasDbRemoteException;
+import com.palantir.lock.remoting.BlockingTimeoutException;
+import com.palantir.remoting2.errors.RemoteException;
+import com.palantir.remoting2.errors.SerializableError;
+import feign.RetryableException;
 import java.sql.Date;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.http.HttpStatus;
 import org.hamcrest.Matcher;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.http.errors.AtlasDbRemoteException;
-import com.palantir.lock.remoting.BlockingTimeoutException;
-import com.palantir.remoting2.errors.RemoteException;
-import com.palantir.remoting2.errors.SerializableError;
-
-import feign.RetryableException;
-
 public class FailoverFeignTargetTest {
     private static final int FAILOVERS = 1000;
     private static final int ITERATIONS = 100;
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FeignOkHttpClientsTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FeignOkHttpClientsTest.java
index d47bc2f5450..8ef809f0d29 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FeignOkHttpClientsTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/FeignOkHttpClientsTest.java
@@ -18,10 +18,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Optional;
-
-import org.junit.Test;
-
 import okhttp3.OkHttpClient;
+import org.junit.Test;
 
 public class FeignOkHttpClientsTest {
     @Test
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/InterruptHonoringRetryerTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/InterruptHonoringRetryerTest.java
index c4875eb9e73..c10d7c8d01c 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/InterruptHonoringRetryerTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/InterruptHonoringRetryerTest.java
@@ -17,14 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import feign.RetryableException;
 import java.io.InterruptedIOException;
 import java.sql.Date;
 import java.time.Instant;
-
 import org.junit.Test;
 
-import feign.RetryableException;
-
 public class InterruptHonoringRetryerTest {
 
     private final InterruptHonoringRetryer retryer = new InterruptHonoringRetryer();
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/SerializableErrorDecoderTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/SerializableErrorDecoderTest.java
index 92b5efb99de..aa1daa19966 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/SerializableErrorDecoderTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/SerializableErrorDecoderTest.java
@@ -17,16 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import javax.ws.rs.core.MediaType;
-
-import org.apache.http.HttpStatus;
-import org.junit.Test;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
@@ -39,8 +29,14 @@
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.remoting2.errors.SerializableError;
 import com.palantir.remoting2.ext.jackson.ObjectMappers;
-
 import feign.Response;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import javax.ws.rs.core.MediaType;
+import org.apache.http.HttpStatus;
+import org.junit.Test;
 
 @SuppressWarnings("ThrowableNotThrown")
 public class SerializableErrorDecoderTest {
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/TextDelegateDecoderTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/TextDelegateDecoderTest.java
index 51962b35370..ce7e1c6d977 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/TextDelegateDecoderTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/TextDelegateDecoderTest.java
@@ -20,22 +20,18 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.net.HttpHeaders;
+import feign.Response;
+import feign.codec.Decoder;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.Map;
-
 import javax.ws.rs.core.MediaType;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.net.HttpHeaders;
-
-import feign.Response;
-import feign.codec.Decoder;
-
 public class TextDelegateDecoderTest {
     private static final int HTTP_OK = 200;
     private static final String REASON = "reason";
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/UserAgentsTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/UserAgentsTest.java
index b0184904881..959c1a7f1cc 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/UserAgentsTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/UserAgentsTest.java
@@ -20,7 +20,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.concurrent.BlockingDeque;
-
 import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteExceptionTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteExceptionTest.java
index 39c1a27f703..de17370379c 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteExceptionTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbRemoteExceptionTest.java
@@ -15,17 +15,14 @@
  */
 package com.palantir.atlasdb.http.errors;
 
-import java.util.List;
-
-import javax.ws.rs.NotFoundException;
-
-import org.apache.http.HttpStatus;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.remoting2.errors.RemoteException;
 import com.palantir.remoting2.errors.SerializableError;
 import com.palantir.remoting2.errors.SerializableStackTraceElement;
+import java.util.List;
+import javax.ws.rs.NotFoundException;
+import org.apache.http.HttpStatus;
+import org.junit.Test;
 
 @SuppressWarnings("ThrowableInstanceNeverThrown") // This test validates properties of runtime exceptions.
 public class AtlasDbRemoteExceptionTest {
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElementTest.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElementTest.java
index 445a11a554c..aaac6c6ccd2 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElementTest.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/AtlasDbStackTraceElementTest.java
@@ -17,9 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.remoting2.errors.SerializableStackTraceElement;
+import org.junit.Test;
 
 /**
  * We only need to test that our custom toString() can cope with Optional.empty() in a reasonable way.
diff --git a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/RemotingExceptionTestUtils.java b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/RemotingExceptionTestUtils.java
index 13409a261b1..62563c73db1 100644
--- a/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/RemotingExceptionTestUtils.java
+++ b/atlasdb-feign/src/test/java/com/palantir/atlasdb/http/errors/RemotingExceptionTestUtils.java
@@ -17,11 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-import java.util.stream.IntStream;
-
 import com.palantir.remoting2.errors.RemoteException;
 import com.palantir.remoting2.errors.SerializableStackTraceElement;
+import java.util.List;
+import java.util.stream.IntStream;
 
 public final class RemotingExceptionTestUtils {
     private RemotingExceptionTestUtils() {
diff --git a/atlasdb-hikari/src/main/java/com/palantir/atlasdb/jdbc/config/HikariDataSourceConfiguration.java b/atlasdb-hikari/src/main/java/com/palantir/atlasdb/jdbc/config/HikariDataSourceConfiguration.java
index a6ba1672ea7..172c844b0d8 100644
--- a/atlasdb-hikari/src/main/java/com/palantir/atlasdb/jdbc/config/HikariDataSourceConfiguration.java
+++ b/atlasdb-hikari/src/main/java/com/palantir/atlasdb/jdbc/config/HikariDataSourceConfiguration.java
@@ -15,18 +15,15 @@
  */
 package com.palantir.atlasdb.jdbc.config;
 
-import java.util.Properties;
-
-import javax.sql.DataSource;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.auto.service.AutoService;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import java.util.Properties;
+import javax.sql.DataSource;
+import org.immutables.value.Value;
 
 @AutoService(JdbcDataSourceConfiguration.class)
 @Value.Immutable
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java
index cbd8bf332c4..3a709c8fcc0 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.cleaner;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.logsafe.SafeArg;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.LongSupplier;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.logsafe.SafeArg;
-
 /**
  * Wrap another Puncher, optimizing the #punch() operation to operate just on a local variable; the
  * underlying "real" punch operation is only invoked asynchronously at a fixed interval, with the
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java
index 0634f86b10c..c738d1b557e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.Collection;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
@@ -28,6 +25,8 @@
 import com.palantir.atlasdb.transaction.api.Transaction.TransactionType;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.logsafe.Preconditions;
+import java.util.Collection;
+import java.util.Set;
 
 public final class CleanupFollower implements Follower {
     private final ImmutableMultimap<TableReference, OnCleanupTask> cleanupTasksByTable;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java
index f75132c91a9..51ca2f5daec 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.List;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -35,6 +28,11 @@
 import com.palantir.lock.impl.LegacyTimelockService;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.TimestampService;
+import java.util.List;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultCleanerBuilder {
     private static final Logger log = LoggerFactory.getLogger(DefaultCleanerBuilder.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java
index d3ae1c9c35b..6f751c49c2e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.Set;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Set;
 
 /**
  * A callback that is called as part of scrubbing and sweeping.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java
index 445c71e6b5d..715646fd455 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.function.Supplier;
-
 import com.palantir.common.time.Clock;
 import com.palantir.lock.LockService;
 import com.palantir.lock.v2.TimelockService;
+import java.util.function.Supplier;
 
 /**
  * Clock implementation that delegates to a LockService.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java
index 7c4f2550458..05ffa7a0881 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
 import com.google.common.base.Suppliers;
 import com.palantir.lock.v2.TimelockService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 /**
  * This will return immutableTimestamps
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java
index 4df6346fe97..1a8633790c6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.cleaner;
 
+import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.NavigableMap;
 
-import com.google.common.collect.Maps;
-
 /**
  * A simple PuncherStore that does not actually persist. This is useful for unit testing, because
  * the implementation is so simple that it effectively serves as the spec for how a PuncherStore
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java
index 8bfb4d1344f..b7af9089943 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.nio.charset.StandardCharsets;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.async.initializer.AsyncInitializer;
@@ -32,6 +30,7 @@
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.common.base.ClosableIterator;
+import java.nio.charset.StandardCharsets;
 
 /**
  * A PuncherStore implemented as a table in the KeyValueService.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java
index 7292e37e286..072bb9e2963 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.SortedMap;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -44,6 +37,12 @@
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.base.BatchingVisitableFromIterable;
 import com.palantir.common.base.ClosableIterator;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.SortedMap;
 
 /**
  *
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java
index 2d5f748c451..dc9969409d2 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java
@@ -15,27 +15,6 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-
-import javax.annotation.concurrent.GuardedBy;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
@@ -75,6 +54,24 @@
 import com.palantir.common.concurrent.NamedThreadFactory;
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
+import javax.annotation.concurrent.GuardedBy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Scrubs individuals cells on-demand.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java
index 1cb2d4d5fcc..885ece5ad36 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.Map;
-import java.util.SortedMap;
-
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.processors.AutoDelegate;
 import com.palantir.processors.DoDelegate;
+import java.util.Map;
+import java.util.SortedMap;
 
 /**
  * This is the underlying store used by the scrubber for keeping track in a persistent way of the
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java
index 4ad7545df6a..85cb2d05a97 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimpleCleaner.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.cleaner.api.Cleaner;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The SimpleCleaner simply delegates to the various specialized objects that do the real work.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java
index 782b6dcd133..21133a4a1d7 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.function.Supplier;
-
 import com.palantir.common.time.Clock;
+import java.util.function.Supplier;
 
 /**
  * Puncher implementation that calls the underlying PuncherStore directly, and blockingly, on every
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/BackgroundCompactor.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/BackgroundCompactor.java
index 36532b9bc29..a1f11353ca6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/BackgroundCompactor.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/BackgroundCompactor.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.compact;
 
-import java.util.Optional;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -36,6 +28,12 @@
 import com.palantir.lock.SingleLockService;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class BackgroundCompactor implements AutoCloseable {
     public static final long SLEEP_TIME_WHEN_NOTHING_TO_COMPACT_MIN_MILLIS = TimeUnit.SECONDS.toMillis(5);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactPriorityCalculator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactPriorityCalculator.java
index 33714687ff8..0179e36e419 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactPriorityCalculator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactPriorityCalculator.java
@@ -15,23 +15,21 @@
  */
 package com.palantir.atlasdb.compact;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.atlasdb.logging.LoggingArgs;
+import com.palantir.atlasdb.transaction.api.Transaction;
+import com.palantir.atlasdb.transaction.api.TransactionManager;
+import com.palantir.logsafe.Arg;
+import com.palantir.logsafe.SafeArg;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.atlasdb.logging.LoggingArgs;
-import com.palantir.atlasdb.transaction.api.Transaction;
-import com.palantir.atlasdb.transaction.api.TransactionManager;
-import com.palantir.logsafe.Arg;
-import com.palantir.logsafe.SafeArg;
-
 class CompactPriorityCalculator {
     private static final Logger log = LoggerFactory.getLogger(CompactPriorityCalculator.class);
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionHistoryProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionHistoryProvider.java
index 6918398c210..c4e63c9cb93 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionHistoryProvider.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionHistoryProvider.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.compact;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.palantir.atlasdb.schema.generated.CompactMetadataTable;
 import com.palantir.atlasdb.schema.generated.CompactTableFactory;
 import com.palantir.atlasdb.transaction.api.Transaction;
+import java.util.HashMap;
+import java.util.Map;
 
 class CompactionHistoryProvider {
     Map<String, Long> getHistory(Transaction tx) {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionOutcomeMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionOutcomeMetrics.java
index 004bf0aa003..e47a3a8f345 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionOutcomeMetrics.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactionOutcomeMetrics.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.compact;
 
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
 import com.codahale.metrics.SlidingTimeWindowReservoir;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.util.MetricsManager;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
 
 class CompactionOutcomeMetrics {
     private final SlidingTimeWindowReservoir reservoir;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactorConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactorConfig.java
index b5df940aab2..1f59b98b2f1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactorConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/CompactorConfig.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.atlasdb.compact;
 
-import java.util.concurrent.TimeUnit;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
+import java.util.concurrent.TimeUnit;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableCompactorConfig.class)
 @JsonDeserialize(as = ImmutableCompactorConfig.class)
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/SweepHistoryProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/SweepHistoryProvider.java
index 8906569f86e..3b76e95755e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/SweepHistoryProvider.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/compact/SweepHistoryProvider.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.compact;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.schema.generated.SweepPriorityTable;
 import com.palantir.atlasdb.schema.generated.SweepPriorityTable.SweepPriorityNamedColumn;
 import com.palantir.atlasdb.schema.generated.SweepTableFactory;
 import com.palantir.atlasdb.transaction.api.Transaction;
+import java.util.HashMap;
+import java.util.Map;
 
 class SweepHistoryProvider {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ClientLockDiagnosticCollector.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ClientLockDiagnosticCollector.java
index 2d950029180..76161d2d5c3 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ClientLockDiagnosticCollector.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ClientLockDiagnosticCollector.java
@@ -16,20 +16,18 @@
 
 package com.palantir.atlasdb.debug;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.lock.LockDescriptor;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.LongStream;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.lock.LockDescriptor;
-
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
  * @deprecated Remove this once PDS-95791 is resolved.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ClientLockDiagnosticCollectorImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ClientLockDiagnosticCollectorImpl.java
index 9498433af6e..38e00322550 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ClientLockDiagnosticCollectorImpl.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ClientLockDiagnosticCollectorImpl.java
@@ -16,22 +16,20 @@
 
 package com.palantir.atlasdb.debug;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.lock.LockDescriptor;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.BiFunction;
 import java.util.function.UnaryOperator;
 import java.util.stream.LongStream;
-
 import javax.annotation.Nullable;
 
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.lock.LockDescriptor;
-
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
  * @deprecated Remove this once PDS-95791 is resolved.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ConflictTracer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ConflictTracer.java
index 1ee30ab63bd..05547fa79c1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ConflictTracer.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/ConflictTracer.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.debug;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import java.util.Map;
 
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/FullDiagnosticDigest.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/FullDiagnosticDigest.java
index aff7004442b..9b4422b3c1b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/FullDiagnosticDigest.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/FullDiagnosticDigest.java
@@ -16,21 +16,19 @@
 
 package com.palantir.atlasdb.debug;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.palantir.atlasdb.debug.ClientLockDiagnosticCollector.ClientLockDiagnosticDigest;
+import com.palantir.atlasdb.debug.ClientLockDiagnosticCollector.ConflictTrace;
+import com.palantir.lock.LockDescriptor;
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.palantir.atlasdb.debug.ClientLockDiagnosticCollector.ClientLockDiagnosticDigest;
-import com.palantir.atlasdb.debug.ClientLockDiagnosticCollector.ConflictTrace;
-import com.palantir.lock.LockDescriptor;
-
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
  * @deprecated Remove this once PDS-95791 is resolved.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticConfig.java
index c1bf5d16eb2..deab4f50245 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticConfig.java
@@ -16,13 +16,11 @@
 
 package com.palantir.atlasdb.debug;
 
-import java.time.Duration;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.time.Duration;
+import org.immutables.value.Value;
 
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticInfo.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticInfo.java
index 5bc7edf673d..0756021f133 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticInfo.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticInfo.java
@@ -16,15 +16,13 @@
 
 package com.palantir.atlasdb.debug;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
  * @deprecated Remove this once PDS-95791 is resolved.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticInfoService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticInfoService.java
index 92b4d02211d..2459651971d 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticInfoService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticInfoService.java
@@ -19,7 +19,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticTimelockRpcClient.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticTimelockRpcClient.java
index 7f93dc16574..2d6b6794241 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticTimelockRpcClient.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockDiagnosticTimelockRpcClient.java
@@ -16,8 +16,6 @@
 
 package com.palantir.atlasdb.debug;
 
-import java.util.Optional;
-
 import com.palantir.lock.client.IdentifiedLockRequest;
 import com.palantir.lock.v2.AutoDelegate_TimelockRpcClient;
 import com.palantir.lock.v2.LockResponseV2;
@@ -26,6 +24,7 @@
 import com.palantir.lock.v2.TimelockRpcClient;
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.lock.v2.WaitForLocksResponse;
+import java.util.Optional;
 
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockInfo.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockInfo.java
index 39bacce2f80..cbd0ae50533 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockInfo.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/LockInfo.java
@@ -16,15 +16,13 @@
 
 package com.palantir.atlasdb.debug;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.time.Instant;
 import java.util.Map;
 import java.util.UUID;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
  * @deprecated Remove this once PDS-95791 is resolved.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/WritesDigest.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/WritesDigest.java
index 2cdd561ccae..23ca0d314cb 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/WritesDigest.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/WritesDigest.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.debug;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.util.SortedMap;
 import java.util.SortedSet;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 @JsonDeserialize(as = ImmutableWritesDigest.class)
 @JsonSerialize(as = ImmutableWritesDigest.class)
 @Value.Immutable
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/WritesDigestEmitter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/WritesDigestEmitter.java
index c73561d28fc..bcbea3cd4e2 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/WritesDigestEmitter.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/debug/WritesDigestEmitter.java
@@ -16,15 +16,6 @@
 
 package com.palantir.atlasdb.debug;
 
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
@@ -39,6 +30,13 @@
 import com.palantir.common.persist.Persistable;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WritesDigestEmitter {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/futures/AtlasFutures.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/futures/AtlasFutures.java
index 26160c89e38..5a49820abb9 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/futures/AtlasFutures.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/futures/AtlasFutures.java
@@ -16,17 +16,16 @@
 
 package com.palantir.atlasdb.futures;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.tracing.DeferredTracer;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 
 public final class AtlasFutures {
     private AtlasFutures() {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/futures/FuturesCombiner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/futures/FuturesCombiner.java
index 10862120a8c..d6bec326c9f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/futures/FuturesCombiner.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/futures/FuturesCombiner.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.futures;
 
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 
-import com.google.common.util.concurrent.ListenableFuture;
-
 /**
  * Interface which provides a wrapping over static methods in {@link AtlasFutures} which need an
  * {@link ExecutorService}. This interface is useful when considering how to easily have a custom resource management
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaConfig.java
index e70aaffd18d..dfadbcbec25 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaConfig.java
@@ -16,15 +16,13 @@
 
 package com.palantir.atlasdb.internalschema;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 /**
  * An {@link InternalSchemaConfig} contains information that can be used for controlling how the internal schema
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaMetadata.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaMetadata.java
index 9819000b869..5eac968f726 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaMetadata.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/InternalSchemaMetadata.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.internalschema;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.collect.ImmutableRangeMap;
 import com.google.common.collect.Range;
+import org.immutables.value.Value;
 
 /**
  * An {@link InternalSchemaMetadata} object controls how Atlas nodes carry out certain operations.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/ReadOnlyTransactionSchemaManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/ReadOnlyTransactionSchemaManager.java
index 61eeda30a13..5e5f38248ea 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/ReadOnlyTransactionSchemaManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/ReadOnlyTransactionSchemaManager.java
@@ -16,16 +16,14 @@
 
 package com.palantir.atlasdb.internalschema;
 
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.coordination.CoordinationService;
 import com.palantir.atlasdb.coordination.ValueAndBound;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ReadOnlyTransactionSchemaManager {
     private static final Logger log = LoggerFactory.getLogger(TransactionSchemaManager.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMap.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMap.java
index a88ab007f28..f543532a731 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMap.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMap.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.internalschema;
 
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.collect.ImmutableRangeMap;
@@ -33,6 +26,11 @@
 import com.palantir.common.annotation.Output;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.immutables.value.Value;
 
 /**
  * A {@link TimestampPartitioningMap} keeps track of a mapping of timestamp ranges to values.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstaller.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstaller.java
index 8517a45e254..9339a07f7c1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstaller.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstaller.java
@@ -16,19 +16,17 @@
 
 package com.palantir.atlasdb.internalschema;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.logsafe.SafeArg;
 import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.logsafe.SafeArg;
-
 public final class TransactionSchemaInstaller implements AutoCloseable {
     private static final Logger log = LoggerFactory.getLogger(TransactionSchemaInstaller.class);
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaManager.java
index 50f1f42b4a3..a6fca60a768 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/TransactionSchemaManager.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.internalschema;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Range;
@@ -33,6 +26,11 @@
 import com.palantir.common.concurrent.CoalescingSupplier;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TransactionSchemaManager {
     private static final Logger log = LoggerFactory.getLogger(TransactionSchemaManager.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetrics.java
index e4517fd8d90..365eb07e1ee 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetrics.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetrics.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.internalschema.metrics;
 
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Clock;
 import com.palantir.atlasdb.AtlasDbMetricNames;
 import com.palantir.atlasdb.coordination.CoordinationService;
@@ -32,6 +25,11 @@
 import com.palantir.atlasdb.monitoring.TrackerUtils;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.timestamp.TimestampService;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class MetadataCoordinationServiceMetrics {
     private static final Logger log = LoggerFactory.getLogger(MetadataCoordinationServiceMetrics.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/CoordinationServices.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/CoordinationServices.java
index fac3918dedf..021cc360656 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/CoordinationServices.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/CoordinationServices.java
@@ -16,8 +16,6 @@
 
 package com.palantir.atlasdb.internalschema.persistence;
 
-import java.util.function.LongSupplier;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.coordination.CoordinationService;
 import com.palantir.atlasdb.coordination.CoordinationServiceImpl;
@@ -30,6 +28,7 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.conjure.java.serialization.ObjectMappers;
 import com.palantir.timestamp.TimestampService;
+import java.util.function.LongSupplier;
 
 public final class CoordinationServices {
     private CoordinationServices() {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodec.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodec.java
index 2c4be6919f0..5cb3bcf75a4 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodec.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodec.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.internalschema.persistence;
 
-import java.io.IOException;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
@@ -28,6 +23,10 @@
 import com.palantir.conjure.java.serialization.ObjectMappers;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
 
 /**
  * The {@link InternalSchemaMetadataPayloadCodec} controls translation between the payload of a
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadata.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadata.java
index 7a285267e21..2d5756c67be 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadata.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadata.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.internalschema.persistence;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.internalschema.InternalSchemaMetadata;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 /**
  * A serialized form of {@link InternalSchemaMetadata} that includes both a
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/TableMappingService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/TableMappingService.java
index edfd9bc780d..2383e288ecd 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/TableMappingService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/TableMappingService.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.keyvalue;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.common.annotation.Idempotent;
 import com.palantir.common.exception.TableMappingNotFoundException;
+import java.util.Map;
+import java.util.Set;
 
 public interface TableMappingService {
     /**
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersister.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersister.java
index 00fbe605515..d941c7ef47b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersister.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersister.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
@@ -24,6 +22,7 @@
 import com.palantir.atlasdb.ptobject.EncodingUtils;
 import com.palantir.atlasdb.sweep.queue.id.SweepTableIndices;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import java.io.IOException;
 
 public final class WriteReferencePersister {
     private static final byte[] writePrefix = { 1 };
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingService.java
index dc7cca9055a..f698154ecc5 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingService.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.LongSupplier;
-
-import org.apache.commons.lang3.Validate;
-
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
@@ -55,6 +46,13 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.exception.TableMappingNotFoundException;
 import com.palantir.logsafe.Preconditions;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.LongSupplier;
+import org.apache.commons.lang3.Validate;
 
 public class KvTableMappingService implements TableMappingService {
     public static final TableMetadata NAMESPACE_TABLE_METADATA = TableMetadata.internal()
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java
index 1663bb35901..931b73a2b65 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.ForwardingObject;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
@@ -50,6 +43,12 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.exception.TableMappingNotFoundException;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public final class TableRemappingKeyValueService extends ForwardingObject implements KeyValueService {
     public static TableRemappingKeyValueService create(KeyValueService delegate,
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java
index 51982b480b3..4efe698b530 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collection;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -52,6 +44,13 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.Collection;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
 
 /*
  * WARNING: Code assumes that this will be called above namespace mapping layer.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java
index 0f8460bd49a..c49667a3ef8 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.memory;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.auto.service.AutoService;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @JsonTypeName(InMemoryAtlasDbConfig.TYPE)
 @AutoService(KeyValueServiceConfig.class)
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java
index cdd73d10652..84f87dfdeeb 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.memory;
 
-import java.util.Optional;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.auto.service.AutoService;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
 import com.palantir.atlasdb.config.LeaderConfig;
@@ -36,6 +29,11 @@
 import com.palantir.atlasdb.versions.AtlasDbVersion;
 import com.palantir.timestamp.InMemoryTimestampService;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.Optional;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is the easiest way to try out AtlasDB with your schema.  It runs entirely in memory but has
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TimestampTracker.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TimestampTracker.java
index 2731d619eb7..25725ed4d7c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TimestampTracker.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TimestampTracker.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.monitoring;
 
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Clock;
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.cleaner.api.Cleaner;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.lock.v2.TimelockService;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class TimestampTracker {
     private static final Logger log = LoggerFactory.getLogger(TimestampTracker.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TrackerUtils.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TrackerUtils.java
index b6c2058b1af..979bf1942ac 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TrackerUtils.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/monitoring/TrackerUtils.java
@@ -16,20 +16,18 @@
 
 package com.palantir.atlasdb.monitoring;
 
+import com.codahale.metrics.CachedGauge;
+import com.codahale.metrics.Clock;
+import com.codahale.metrics.Gauge;
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.logsafe.SafeArg;
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BinaryOperator;
 import java.util.function.Supplier;
-
 import org.slf4j.Logger;
 
-import com.codahale.metrics.CachedGauge;
-import com.codahale.metrics.Clock;
-import com.codahale.metrics.Gauge;
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.logsafe.SafeArg;
-
 public final class TrackerUtils {
     // We cache underlying calls, in case a hyper-aggressive metrics client repeatedly queries the values.
     @VisibleForTesting
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/CheckAndSetExceptionMapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/CheckAndSetExceptionMapper.java
index 8ee85ca12fc..6216a423594 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/CheckAndSetExceptionMapper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/CheckAndSetExceptionMapper.java
@@ -15,21 +15,18 @@
  */
 package com.palantir.atlasdb.persistentlock;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.keyvalue.api.CheckAndSetException;
+import com.palantir.logsafe.SafeArg;
 import java.util.List;
 import java.util.UUID;
-
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.palantir.atlasdb.keyvalue.api.CheckAndSetException;
-import com.palantir.logsafe.SafeArg;
-
 public class CheckAndSetExceptionMapper implements ExceptionMapper<CheckAndSetException> {
     private static final Logger log = LoggerFactory.getLogger(CheckAndSetExceptionMapper.class);
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockService.java
index 181cd6d88f6..021fa814b42 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockService.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.persistentlock;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.CheckAndSetException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.conjure.java.server.jersey.WebPreconditions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class KvsBackedPersistentLockService implements PersistentLockService {
     private static final Logger log = LoggerFactory.getLogger(KvsBackedPersistentLockService.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockEntry.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockEntry.java
index 0e754aa7185..966d8179c9e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockEntry.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockEntry.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.persistentlock;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.SortedMap;
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -30,6 +23,11 @@
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.common.base.Throwables;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.SortedMap;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableLockEntry.class)
 @JsonDeserialize(as = ImmutableLockEntry.class)
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockStoreImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockStoreImpl.java
index cfdea20ecbd..0c29a3659b6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockStoreImpl.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/persistentlock/LockStoreImpl.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.persistentlock;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -38,6 +29,13 @@
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.logsafe.SafeArg;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * LockStore manages {@link LockEntry} objects, specifically for the "Backup Lock" (to be taken out by backup and
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/restore/V1TransactionsTableRangeDeleter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/restore/V1TransactionsTableRangeDeleter.java
index 282a3ab66ae..700938239a6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/restore/V1TransactionsTableRangeDeleter.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/restore/V1TransactionsTableRangeDeleter.java
@@ -16,8 +16,6 @@
 
 package com.palantir.atlasdb.restore;
 
-import java.util.OptionalLong;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -30,6 +28,7 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.timestamp.TimestampRange;
+import java.util.OptionalLong;
 
 public class V1TransactionsTableRangeDeleter implements TransactionTableRangeDeleter {
     private final KeyValueService kvs;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java
index c39eaadf1f6..5819fc6fbce 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java
@@ -16,13 +16,6 @@
 package com.palantir.atlasdb.schema;
 
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
@@ -34,6 +27,12 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.PTExecutors;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 public class KeyValueServiceMigrator {
     private final TableReference checkpointTable;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorUtils.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorUtils.java
index 224f42820ac..3e0c85dbe6c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorUtils.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorUtils.java
@@ -15,17 +15,16 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Set;
-
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.schema.KeyValueServiceMigrator.KvsMigrationMessageLevel;
 import com.palantir.atlasdb.schema.KeyValueServiceMigrator.KvsMigrationMessageProcessor;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Set;
 
 public final class KeyValueServiceMigratorUtils {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java
index d7844a2f4f1..54bfc98c797 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
@@ -40,6 +33,12 @@
 import com.palantir.common.base.BatchingVisitableView;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.PTExecutors;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 
 public class KeyValueServiceValidator {
     private final TransactionManager validationFromTransactionManager;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidators.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidators.java
index 9115a5d026f..424a82159fb 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidators.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidators.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public final class KeyValueServiceValidators {
     private KeyValueServiceValidators() {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AbortingCommitTsLoader.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AbortingCommitTsLoader.java
index b67c362786a..d32c7223fd9 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AbortingCommitTsLoader.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AbortingCommitTsLoader.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.benmanes.caffeine.cache.CacheLoader;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -32,6 +24,12 @@
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.atlasdb.transaction.service.TransactionService;
 import com.palantir.logsafe.SafeArg;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AbortingCommitTsLoader implements CacheLoader<Long, Long> {
     private static final Logger log = LoggerFactory.getLogger(AbortingCommitTsLoader.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java
index 4eecb5c8879..7669012af44 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSource.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.sweep;
 
+import com.palantir.atlasdb.util.MetricsManager;
+import com.palantir.logsafe.SafeArg;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
-
 import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.atlasdb.util.MetricsManager;
-import com.palantir.logsafe.SafeArg;
-
 public final class AdjustableSweepBatchConfigSource {
     private static final Logger log = LoggerFactory.getLogger(BackgroundSweeperImpl.class);
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweepThread.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweepThread.java
index fbb5e89dfe7..6c22d89e7bb 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweepThread.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweepThread.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.time.Duration;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
@@ -41,6 +31,14 @@
 import com.palantir.lock.SingleLockService;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BackgroundSweepThread implements Runnable {
     private static final Logger log = LoggerFactory.getLogger(BackgroundSweepThread.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java
index 82ebcc95e7a..b97fd6ec3ae 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.sweep.metrics.SweepOutcomeMetrics;
 import com.palantir.atlasdb.sweep.priority.NextTableToSweepProvider;
@@ -30,6 +23,11 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.lock.LockService;
 import com.palantir.logsafe.Preconditions;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class BackgroundSweeperImpl implements BackgroundSweeper, AutoCloseable {
     private static final Logger log = LoggerFactory.getLogger(BackgroundSweeperImpl.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BatchOfCellsToSweep.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BatchOfCellsToSweep.java
index a614eb6541d..2ef39297098 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BatchOfCellsToSweep.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BatchOfCellsToSweep.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.sweep;
 
+import com.palantir.atlasdb.keyvalue.api.Cell;
 import java.util.List;
-
 import org.immutables.value.Value;
 
-import com.palantir.atlasdb.keyvalue.api.Cell;
-
 @Value.Immutable
 public interface BatchOfCellsToSweep {
     List<CellToSweep> cells();
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellToSweep.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellToSweep.java
index 103fd93bc58..120c68cfd5f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellToSweep.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellToSweep.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.sweep;
 
+import com.palantir.atlasdb.keyvalue.api.Cell;
 import java.util.List;
-
 import org.immutables.value.Value;
 
-import com.palantir.atlasdb.keyvalue.api.Cell;
-
 @Value.Immutable
 public interface CellToSweep {
     Cell cell();
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsSweeper.java
index 3da43b37e68..92568c2bfb6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsSweeper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsSweeper.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.cleaner.Follower;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -34,6 +26,12 @@
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CellsSweeper {
     private static final Logger log = LoggerFactory.getLogger(CellsSweeper.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIterator.java
index 063046902ab..598100d0110 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIterator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIterator.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 
 // The batches can end up very small or even empty after we filter out unsweepable cells,
 // so we want to re-partition them before deleting.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CommitTsCache.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CommitTsCache.java
index 7ad1e033385..ef4674b16dc 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CommitTsCache.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CommitTsCache.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.sweep;
 
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.palantir.atlasdb.transaction.service.TransactionService;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
-import com.palantir.atlasdb.transaction.service.TransactionService;
-
 public final class CommitTsCache {
     private static final Long ONE_MILLION = 1_000_000L;
     private LoadingCache<Long, Long> cache;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/PersistentLockManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/PersistentLockManager.java
index 26dfc477899..c89d07fdca6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/PersistentLockManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/PersistentLockManager.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.List;
-
-import javax.annotation.concurrent.GuardedBy;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Meter;
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.keyvalue.api.CheckAndSetException;
@@ -32,6 +25,10 @@
 import com.palantir.exception.NotInitializedException;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.util.List;
+import javax.annotation.concurrent.GuardedBy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // TODO move to persistentlock package?
 public class PersistentLockManager implements AutoCloseable {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java
index c596d29dcdb..d6f1b71fa23 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SpecificTableSweeper.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -41,6 +36,9 @@
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SpecificTableSweeper {
     private static final Logger log = LoggerFactory.getLogger(SpecificTableSweeper.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepBatchConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepBatchConfig.java
index da33f5a1ebf..925c3991769 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepBatchConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepBatchConfig.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import org.immutables.value.Value;
-
 import com.palantir.logsafe.Preconditions;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface SweepBatchConfig {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepPerformanceResults.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepPerformanceResults.java
index b0767d17079..49a539226d6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepPerformanceResults.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepPerformanceResults.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class SweepPerformanceResults {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTableResponse.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTableResponse.java
index 472f0ec810a..194222b2c50 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTableResponse.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTableResponse.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableSweepTableResponse.class)
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java
index 3f0a8566d47..c46d044c501 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.function.LongSupplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
@@ -50,6 +40,14 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.function.LongSupplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Sweeps one individual table.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepableCellFilter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepableCellFilter.java
index a9c04ce7cb1..3c6bc52703b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepableCellFilter.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepableCellFilter.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.atlasdb.sweep;
 
+import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -23,10 +26,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
-import com.palantir.atlasdb.keyvalue.api.Value;
-import com.palantir.atlasdb.transaction.impl.TransactionConstants;
-
 public class SweepableCellFilter {
     private final CommitTsCache commitTsCache;
     private final Sweeper sweeper;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/Sweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/Sweeper.java
index 40e93365683..07e57faee9c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/Sweeper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/Sweeper.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.Optional;
-import java.util.function.Function;
-
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.sweep.queue.ShardAndStrategy;
 import com.palantir.atlasdb.sweep.queue.SpecialTimestampsSupplier;
+import java.util.Optional;
+import java.util.function.Function;
 
 public enum Sweeper {
     CONSERVATIVE(provider -> Math.min(provider.getUnreadableTimestamp(), provider.getImmutableTimestamp()),
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperService.java
index 190c8ae01d5..2d2137e79ac 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperService.java
@@ -15,8 +15,8 @@
  */
 package com.palantir.atlasdb.sweep;
 
+import com.palantir.logsafe.Safe;
 import java.util.Optional;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -24,8 +24,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.logsafe.Safe;
-
 /**
  * Provides endpoints for sweeping a specific table.
  */
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImpl.java
index fdb08e6fa21..a1e3f552b4d 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImpl.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImpl.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -27,6 +22,9 @@
 import com.palantir.conjure.java.server.jersey.WebPreconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class SweeperServiceImpl implements SweeperService {
     private static final Logger log = LoggerFactory.getLogger(SweeperServiceImpl.class);
@@ -143,4 +141,3 @@ private SweepResults runOneBatchWithoutSavingResults(
     }
 
 }
-
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TableToSweep.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TableToSweep.java
index 44277330044..5900612ca28 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TableToSweep.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TableToSweep.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.Optional;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.sweep.progress.SweepProgress;
 import com.palantir.lock.SingleLockService;
+import java.util.Optional;
 
 public final class TableToSweep {
     private final TableReference tableRef;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetrics.java
index e8b9cbae576..67e5f47f8a8 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetrics.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetrics.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.sweep.metrics;
 
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.base.Suppliers;
 import com.palantir.atlasdb.AtlasDbMetricNames;
 import com.palantir.atlasdb.util.CurrentValueMetric;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
 
 // Not final for Mockito
 @SuppressWarnings("checkstyle:FinalClass")
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetrics.java
index af7825666c2..a8ccc386e7e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetrics.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetrics.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.metrics;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.Reservoir;
 import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import com.google.common.base.Suppliers;
@@ -32,6 +23,13 @@
 import com.palantir.atlasdb.AtlasDbMetricNames;
 import com.palantir.atlasdb.sweep.BackgroundSweeperImpl;
 import com.palantir.atlasdb.util.MetricsManager;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
 
 @Value.Enclosing
 public final class SweepOutcomeMetrics {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetrics.java
index 13e5b68f70a..6e7d091b8b2 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetrics.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetrics.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.metrics;
 
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Gauge;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbMetricNames;
@@ -40,6 +32,12 @@
 import com.palantir.util.AggregatingVersionedMetric;
 import com.palantir.util.AggregatingVersionedSupplier;
 import com.palantir.util.CachedComposedSupplier;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("checkstyle:FinalClass") // non-final for mocking
 public class TargetedSweepMetrics {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProvider.java
index 6bf9f41708b..88020b85e82 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProvider.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProvider.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.priority;
 
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -38,6 +27,15 @@
 import com.palantir.lock.SingleLockService;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NextTableToSweepProvider {
     private static final Logger log = LoggerFactory.getLogger(NextTableToSweepProvider.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculator.java
index fdaac82167e..8fd1b9b47f5 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculator.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.sweep.priority;
 
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.schema.stream.StreamTableType;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.common.annotation.Output;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class StreamStoreRemappingSweepPriorityCalculator {
     public static final long INDEX_TO_VALUE_TABLE_SLEEP_TIME = TimeUnit.MINUTES.toMillis(65);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriority.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriority.java
index 716438eab2f..c2b73f245a3 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriority.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriority.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.sweep.priority;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import java.util.OptionalLong;
-
 import org.immutables.value.Value;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 @Value.Immutable
 public interface SweepPriority {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityCalculator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityCalculator.java
index 51afccd9dcf..aa78745bf24 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityCalculator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityCalculator.java
@@ -15,19 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.priority;
 
-import java.time.Duration;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -39,6 +26,17 @@
 import com.palantir.atlasdb.schema.stream.StreamTableType;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.logsafe.SafeArg;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class SweepPriorityCalculator {
     private static final Logger log = LoggerFactory.getLogger(SweepPriorityCalculator.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityOverrideConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityOverrideConfig.java
index adadb0c9ee7..4e68cfdc23e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityOverrideConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityOverrideConfig.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.priority;
 
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
@@ -28,6 +22,10 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableSweepPriorityOverrideConfig.class)
 @JsonDeserialize(as = ImmutableSweepPriorityOverrideConfig.class)
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStore.java
index 2e6de998bb3..b7da3ae3095 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStore.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.sweep.priority;
 
-import java.util.Collection;
-import java.util.List;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.processors.AutoDelegate;
 import com.palantir.processors.DoDelegate;
+import java.util.Collection;
+import java.util.List;
 
 @AutoDelegate
 public interface SweepPriorityStore {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreImpl.java
index c6703a86f09..9bad6988c1c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreImpl.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreImpl.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.priority;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.OptionalLong;
-
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.palantir.async.initializer.AsyncInitializer;
@@ -35,6 +31,9 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionReadSentinelBehavior;
 import com.palantir.atlasdb.transaction.impl.UnmodifiableTransaction;
+import java.util.Collection;
+import java.util.List;
+import java.util.OptionalLong;
 
 public final class SweepPriorityStoreImpl implements SweepPriorityStore {
     private class InitializingWrapper extends AsyncInitializer implements AutoDelegate_SweepPriorityStore {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/UpdateSweepPriority.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/UpdateSweepPriority.java
index 65d0d46b7fa..a57382099ec 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/UpdateSweepPriority.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/priority/UpdateSweepPriority.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.sweep.priority;
 
 import java.util.OptionalLong;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgress.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgress.java
index 0fb1a3f8c15..e0e8b1da6f5 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgress.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgress.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.sweep.progress;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableSweepProgress.class)
 @JsonDeserialize(as = ImmutableSweepProgress.class)
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStore.java
index 922f5602048..302c8f8d396 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStore.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.sweep.progress;
 
-import java.util.Optional;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.processors.AutoDelegate;
 import com.palantir.processors.DoDelegate;
+import java.util.Optional;
 
 @AutoDelegate
 public interface SweepProgressStore {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreImpl.java
index 968a961c82b..a76f277afab 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreImpl.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreImpl.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.progress;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -40,6 +33,11 @@
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.atlasdb.table.description.ValueType;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class SweepProgressStoreImpl implements SweepProgressStore {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/DedicatedRows.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/DedicatedRows.java
index 03c6ae41575..8312ad049a7 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/DedicatedRows.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/DedicatedRows.java
@@ -16,12 +16,10 @@
 
 package com.palantir.atlasdb.sweep.queue;
 
+import com.palantir.atlasdb.schema.generated.SweepableCellsTable.SweepableCellsRow;
 import java.util.List;
-
 import org.immutables.value.Value;
 
-import com.palantir.atlasdb.schema.generated.SweepableCellsTable.SweepableCellsRow;
-
 @Value.Immutable
 public interface DedicatedRows {
     @Value.Parameter
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/MultiTableSweepQueueWriter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/MultiTableSweepQueueWriter.java
index 5aa4bbdb09d..6b8d093f53f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/MultiTableSweepQueueWriter.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/MultiTableSweepQueueWriter.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.palantir.async.initializer.CallbackInitializable;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Adds {@link WriteInfo}s to a global queue to be swept.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/PartitionInfo.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/PartitionInfo.java
index cea1360b478..36fb4e854cc 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/PartitionInfo.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/PartitionInfo.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import org.immutables.value.Value;
-
 import com.palantir.util.PersistableBoolean;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface PartitionInfo {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategy.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategy.java
index 7e77d7e1397..cb5ce60f6c8 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategy.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategy.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import org.immutables.value.Value;
-
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class ShardAndStrategy {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardProgress.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardProgress.java
index cc4d06fa46d..eb23ae8c2f1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardProgress.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/ShardProgress.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.Map;
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -35,6 +29,10 @@
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.util.PersistableBoolean;
+import java.util.Map;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ShardProgress {
     private static final Logger log = LoggerFactory.getLogger(ShardProgress.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SpecialTimestampsSupplier.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SpecialTimestampsSupplier.java
index 1bc887232ec..e3689766164 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SpecialTimestampsSupplier.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SpecialTimestampsSupplier.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.function.LongSupplier;
-
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.function.LongSupplier;
 
 public class SpecialTimestampsSupplier {
     private final LongSupplier unreadableTsSupplier;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatch.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatch.java
index 064aadb65b8..56d6fe17663 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatch.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatch.java
@@ -17,7 +17,6 @@
 
 import java.util.Collection;
 import java.util.List;
-
 import org.immutables.value.Value;
 
 /**
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulator.java
index 4314fbdabdd..6ecd99a7a95 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulator.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.schema.generated.SweepableCellsTable;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 class SweepBatchAccumulator {
     private final List<WriteInfo> accumulatedWrites = Lists.newArrayList();
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfo.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfo.java
index 9f7ea7a8450..2289bd87f7e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfo.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfo.java
@@ -16,12 +16,10 @@
 
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface SweepBatchWithPartitionInfo {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueue.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueue.java
index 4a702a31943..32521d4c091 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueue.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueue.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.function.IntSupplier;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Suppliers;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.schema.TargetedSweepSchema;
@@ -36,6 +28,12 @@
 import com.palantir.atlasdb.transaction.service.TransactionServices;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.logsafe.SafeArg;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.function.IntSupplier;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class SweepQueue implements MultiTableSweepQueueWriter {
     private static final Logger log = LoggerFactory.getLogger(SweepQueue.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueCleaner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueCleaner.java
index d5b45cf4f65..e0f7ce083c8 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueCleaner.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueCleaner.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
+import com.palantir.atlasdb.logging.LoggingArgs;
+import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory;
+import com.palantir.logsafe.SafeArg;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.atlasdb.logging.LoggingArgs;
-import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory;
-import com.palantir.logsafe.SafeArg;
-
 public class SweepQueueCleaner {
     private static final Logger log = LoggerFactory.getLogger(SweepQueueCleaner.class);
     private SweepableCells sweepableCells;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueDeleter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueDeleter.java
index 12910828c00..850987bb307 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueDeleter.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueDeleter.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -32,6 +23,13 @@
 import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete;
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.atlasdb.sweep.Sweeper;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SweepQueueDeleter {
     private static final Logger log = LoggerFactory.getLogger(SweepQueueDeleter.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueTable.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueTable.java
index 4422e1e5d2b..5dace8ae0ad 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueTable.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueTable.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Streams;
 import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
@@ -34,6 +25,13 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.impl.LocalRowColumnRangeIterator;
 import com.palantir.atlasdb.sweep.metrics.TargetedSweepMetrics;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
 
 public abstract class SweepQueueTable {
     final KeyValueService kvs;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueUtils.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueUtils.java
index aaf3f26d0be..12093815335 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueUtils.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueUtils.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
@@ -32,6 +26,11 @@
 import com.palantir.common.persist.Persistable;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 public final class SweepQueueUtils {
     public static final long REFRESH_TIME = TimeUnit.MINUTES.toMillis(5L);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueWriter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueWriter.java
index be6aa482eec..70cb43ad541 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueWriter.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepQueueWriter.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
+import com.palantir.logsafe.SafeArg;
 import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.logsafe.SafeArg;
-
 class SweepQueueWriter implements MultiTableSweepQueueWriter {
     private static final Logger log = LoggerFactory.getLogger(SweepQueueWriter.class);
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableCells.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableCells.java
index 50cf96ea98f..809a36cce72 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableCells.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableCells.java
@@ -17,19 +17,6 @@
 
 import static com.google.common.base.Preconditions.checkState;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -62,6 +49,17 @@
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.atlasdb.transaction.service.TransactionService;
 import com.palantir.logsafe.SafeArg;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SweepableCells extends SweepQueueTable {
     private final Logger log = LoggerFactory.getLogger(SweepableCells.class);
@@ -441,4 +439,3 @@ private long exactColumnOrElseBeginningOfRow(long startTsInclusive, long partiti
         return Math.max(startTsInclusive - SweepQueueUtils.minTsForFinePartition(partitionFine), 0);
     }
 }
-
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableTimestamps.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableTimestamps.java
index ecbdbd2de38..ccd0a136fcb 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableTimestamps.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/SweepableTimestamps.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -31,6 +25,11 @@
 import com.palantir.atlasdb.schema.generated.SweepableTimestampsTable;
 import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory;
 import com.palantir.util.PersistableBoolean;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class SweepableTimestamps extends SweepQueueTable {
     private static final byte[] DUMMY = new byte[0];
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweepFollower.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweepFollower.java
index 92cc0b300b0..72291d1b7dc 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweepFollower.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweepFollower.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.List;
-import java.util.Set;
-
 import com.palantir.atlasdb.cleaner.Follower;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.List;
+import java.util.Set;
 
 public class TargetedSweepFollower {
     private final List<Follower> followers;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeper.java
index 8218ebeff2a..2ca980a7313 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeper.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Suppliers;
@@ -53,6 +41,16 @@
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import java.util.stream.IntStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"FinalClass", "Not final for mocking in tests"})
 public class TargetedSweeper implements MultiTableSweepQueueWriter, BackgroundSweeper {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLock.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLock.java
index 586aaa5dad5..37ecb9ff32b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLock.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLock.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.Optional;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.lock.v2.LockRequest;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimelockService;
+import java.util.Optional;
 
 public final class TargetedSweeperLock {
     private final ShardAndStrategy shardStrategy;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TimestampsToSweep.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TimestampsToSweep.java
index f8807751eb6..d2e677da365 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TimestampsToSweep.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/TimestampsToSweep.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.sweep.queue;
 
 import java.util.SortedSet;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfo.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfo.java
index e07c5ef860f..40e44944010 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfo.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfo.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import org.immutables.value.Value;
-
 import com.google.common.math.IntMath;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete;
 import com.palantir.atlasdb.keyvalue.api.WriteReference;
 import com.palantir.atlasdb.sweep.Sweeper;
+import org.immutables.value.Value;
 
 /**
  * Contains information about a committed write, for use by the sweep queue.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitioner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitioner.java
index 972a17b367e..1e113dde0a4 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitioner.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitioner.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -33,6 +25,12 @@
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.common.base.Throwables;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WriteInfoPartitioner {
     private static final Logger log = LoggerFactory.getLogger(WriteInfoPartitioner.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/ConservativeSweepWatermarkStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/ConservativeSweepWatermarkStore.java
index 4384cf26b3a..99da10d3f67 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/ConservativeSweepWatermarkStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/ConservativeSweepWatermarkStore.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.sweep.queue.clear;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import java.util.Map;
 import java.util.Set;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 public interface ConservativeSweepWatermarkStore {
     void updateWatermarks(long newWatermark, Set<TableReference> conservativeTables);
     Map<TableReference, Long> getWatermarks(Set<TableReference> tableReferences);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStore.java
index babf14563a6..b50aef31306 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStore.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.sweep.queue.clear;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -36,6 +31,10 @@
 import com.palantir.atlasdb.schema.generated.TableClearsTable.TableClearsRowResult;
 import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory;
 import com.palantir.common.streams.KeyedStream;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public final class DefaultConservativeSweepWatermarkStore implements ConservativeSweepWatermarkStore {
     private static final TableReference CLEARS = TargetedSweepTableFactory.of().getTableClearsTable(null).getTableRef();
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearer.java
index 39f067bbb4b..d980fd23dbc 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearer.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearer.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.sweep.queue.clear;
 
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.annotations.VisibleForTesting;
@@ -35,6 +28,12 @@
 import com.palantir.atlasdb.sweep.queue.TargetedSweepFilter;
 import com.palantir.atlasdb.sweep.queue.WriteInfo;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 public final class DefaultTableClearer implements TableClearer, TargetedSweepFilter {
     private final LoadingCache<TableReference, SweepStrategy> sweepStrategies;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/SafeTableClearerKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/SafeTableClearerKeyValueService.java
index bc423388648..1ae4e81d748 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/SafeTableClearerKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/SafeTableClearerKeyValueService.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.sweep.queue.clear;
 
-import java.util.Set;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.impl.ForwardingKeyValueService;
 import com.palantir.atlasdb.sweep.queue.ImmutableTimestampSupplier;
+import java.util.Set;
 
 public class SafeTableClearerKeyValueService extends ForwardingKeyValueService {
     private final KeyValueService delegate;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/TableClearer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/TableClearer.java
index 46219c82502..f25d148bca1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/TableClearer.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/clear/TableClearer.java
@@ -16,10 +16,9 @@
 
 package com.palantir.atlasdb.sweep.queue.clear;
 
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Set;
 
 public interface TableClearer {
     void deleteAllRowsInTables(Set<TableReference> tables);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepInstallConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepInstallConfig.java
index 17db148e139..2f9456edb39 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepInstallConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepInstallConfig.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.sweep.queue.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.AtlasDbConstants;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableTargetedSweepInstallConfig.class)
 @JsonSerialize(as = ImmutableTargetedSweepInstallConfig.class)
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepRuntimeConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepRuntimeConfig.java
index beca06c77fe..e3674b9bf64 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepRuntimeConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/config/TargetedSweepRuntimeConfig.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.sweep.queue.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.AtlasDbConstants;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableTargetedSweepRuntimeConfig.class)
 @JsonSerialize(as = ImmutableTargetedSweepRuntimeConfig.class)
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/IdsToNames.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/IdsToNames.java
index fe049516f65..a9ccef2d70b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/IdsToNames.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/IdsToNames.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue.id;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Optional;
-
 import com.google.common.collect.Iterables;
 import com.google.common.primitives.Ints;
 import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
@@ -36,6 +31,10 @@
 import com.palantir.atlasdb.schema.generated.SweepIdToNameTable.SweepIdToNameRow;
 import com.palantir.atlasdb.schema.generated.SweepIdToNameTable.SweepIdToNameRowResult;
 import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory;
+import java.util.Collections;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Optional;
 
 class IdsToNames {
     private static final TargetedSweepTableFactory tableFactory = TargetedSweepTableFactory.of();
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/NamesToIds.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/NamesToIds.java
index 2ba487c08f8..e5991ea3f83 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/NamesToIds.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/NamesToIds.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.queue.id;
 
-import java.util.Collections;
-import java.util.Optional;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.CheckAndSetException;
 import com.palantir.atlasdb.keyvalue.api.CheckAndSetRequest;
@@ -28,6 +25,8 @@
 import com.palantir.atlasdb.schema.generated.SweepNameToIdTable.SweepNameToIdRow;
 import com.palantir.atlasdb.schema.generated.TargetedSweepTableFactory;
 import com.palantir.logsafe.Preconditions;
+import java.util.Collections;
+import java.util.Optional;
 
 class NamesToIds {
     private static final TargetedSweepTableFactory tableFactory = TargetedSweepTableFactory.of();
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndices.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndices.java
index a4d462c0f81..840a2d563b0 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndices.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndices.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.sweep.queue.id;
 
-import java.util.NoSuchElementException;
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.logsafe.SafeArg;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Creates a dictionary of table references to shorter (integral) identifiers.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java
index e3da2248ef6..0d36290105c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.table.common;
 
-import java.util.Arrays;
-
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
 
 public class MutableRange {
     private byte[] startRow;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java
index ee7916874ea..bcbdfc84c02 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.table.common;
 
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -39,6 +29,14 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.BlockingWorkerPool;
 import com.palantir.lock.HeldLocksToken;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RangeVisitor {
     private static final Logger log = LoggerFactory.getLogger(RangeVisitor.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java
index 4bf692ae63c..27144d028c9 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.table.common;
 
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Predicate;
@@ -52,6 +41,15 @@
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class TableTasks {
     private static final Logger log = LoggerFactory.getLogger(TableTasks.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/TransactionConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/TransactionConfig.java
index b405b9b877a..631204122ec 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/TransactionConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/TransactionConfig.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.transaction;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.transaction.impl.TransactionRetryStrategy;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableTransactionConfig.class)
 @JsonSerialize(as = ImmutableTransactionConfig.class)
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategy.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategy.java
index 5c05b83beac..2f82b5da748 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategy.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategy.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.transaction.encoding;
 
-import java.util.Arrays;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import java.util.Arrays;
 
 /**
  * The ticketing algorithm distributes timestamps among rows and dynamic columns to avoid hot-spotting.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java
index 9cdc26c8aed..8a23c9ca6b6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.function.Supplier;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.cache.TimestampCache;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.lock.HeldLocksToken;
 import com.palantir.lock.LockRequest;
+import java.util.function.Supplier;
 
 public abstract class AbstractLockAwareTransactionManager extends AbstractConditionAwareTransactionManager {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java
index b5e59ade5c4..73d383224d2 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AdvisoryLockConditionSuppliers.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Set;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.transaction.api.LockAcquisitionException;
@@ -29,6 +23,10 @@
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.LockService;
 import com.palantir.logsafe.Preconditions;
+import java.util.Set;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class AdvisoryLockConditionSuppliers {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java
index 7e11108bc96..7b84e3df0f6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
+import com.palantir.common.base.ClosableIterator;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
-import com.palantir.common.base.ClosableIterator;
-
 public interface BatchProvider<T> {
     ClosableIterator<T> getBatch(int batchSize, @Nullable byte[] lastToken);
     boolean hasNext(byte[] lastToken);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java
index 26f888dbb5b..422f6c31c7f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
 import com.palantir.atlasdb.AtlasDbPerformanceConstants;
@@ -29,6 +22,10 @@
 import com.palantir.common.base.ClosableIterators;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.AssertUtils;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BatchSizeIncreasingIterator<T> {
     private static final Logger log = LoggerFactory.getLogger(BatchSizeIncreasingIterator.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java
index 9c6f25fbf1f..4e451d3f325 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.keyvalue.api.BatchColumnRangeSelection;
@@ -33,6 +27,10 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.base.ClosableIterators;
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
 
 public class ColumnRangeBatchProvider implements BatchProvider<Map.Entry<Cell, Value>> {
     private final KeyValueService keyValueService;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutors.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutors.java
index 47944d2e3a4..de3a96efa48 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutors.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutors.java
@@ -16,16 +16,15 @@
 
 package com.palantir.atlasdb.transaction.impl;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
 import java.time.Duration;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-
 final class DefaultTaskExecutors {
     private static final Duration DEFAULT_IDLE_TIMEOUT = Duration.ofSeconds(5);
     private static final int SINGLE_THREAD = 1;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ExternalLocksCondition.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ExternalLocksCondition.java
index 310d18909e4..ea5304d6d85 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ExternalLocksCondition.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ExternalLocksCondition.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.transaction.api.TransactionLockTimeoutNonRetriableException;
 import com.palantir.lock.HeldLocksToken;
 import com.palantir.lock.LockRefreshToken;
 import com.palantir.lock.LockService;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ExternalLocksCondition implements AdvisoryLocksCondition {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/InstrumentedTimelockService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/InstrumentedTimelockService.java
index 78518ccdf81..666827dfc60 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/InstrumentedTimelockService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/InstrumentedTimelockService.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Set;
-import java.util.function.Supplier;
-
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.AtlasDbMetricNames;
@@ -30,6 +27,8 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.timestamp.TimestampRange;
+import java.util.Set;
+import java.util.function.Supplier;
 
 public class InstrumentedTimelockService implements TimelockService {
     private final TimelockService timelockService;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/PreCommitConditions.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/PreCommitConditions.java
index 410048cda2f..14f3fb04e1a 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/PreCommitConditions.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/PreCommitConditions.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
+import com.palantir.atlasdb.transaction.api.PreCommitCondition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.atlasdb.transaction.api.PreCommitCondition;
-
 public final class PreCommitConditions {
 
     private static final Logger log = LoggerFactory.getLogger(PreCommitConditions.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java
index b872225bce1..abad7d15a52 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransactionManager.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.util.concurrent.MoreExecutors;
 import com.palantir.atlasdb.cache.TimestampCache;
 import com.palantir.atlasdb.cleaner.api.Cleaner;
@@ -43,6 +38,9 @@
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class ReadOnlyTransactionManager extends AbstractLockAwareTransactionManager  {
     private static final Logger log = LoggerFactory.getLogger(ReadOnlyTransactionManager.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java
index 4199143f154..5e095c6f823 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
@@ -28,6 +23,9 @@
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
+import java.util.List;
+import javax.annotation.Nullable;
 
 public class RowRangeBatchProvider implements BatchProvider<RowResult<Value>> {
     private final KeyValueService keyValueService;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java
index f2cf85dcbad..80d45aa8645 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java
@@ -15,32 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.NoSuchElementException;
-import java.util.Optional;
-import java.util.OptionalLong;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentNavigableMap;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Functions;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -98,6 +72,29 @@
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.Pair;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class will track all reads to verify that there are no read-write conflicts at commit time.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java
index f74719c6355..8fc8ad07351 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManager.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.async.initializer.Callback;
@@ -56,6 +46,14 @@
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SerializableTransactionManager extends SnapshotTransactionManager {
     private static final Logger log = LoggerFactory.getLogger(SerializableTransactionManager.class);
@@ -529,4 +527,3 @@ ConflictDetectionManager getConflictDetectionManager() {
     }
 
 }
-
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java
index 86739b2c3c9..4fc722af0a8 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShouldNotDeleteAndRollbackTransaction.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.AbstractExecutorService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.cache.TimestampCache;
 import com.palantir.atlasdb.cleaner.NoOpCleaner;
 import com.palantir.atlasdb.debug.ConflictTracer;
@@ -32,6 +25,12 @@
 import com.palantir.atlasdb.transaction.api.TransactionReadSentinelBehavior;
 import com.palantir.atlasdb.transaction.service.TransactionService;
 import com.palantir.atlasdb.util.MetricsManager;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 /**
  * This will read the values of all committed transactions.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java
index 7251844ea40..208c985b48d 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java
@@ -15,38 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentNavigableMap;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BiFunction;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.Validate;
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
@@ -156,6 +124,35 @@
 import com.palantir.tracing.CloseableTracer;
 import com.palantir.util.AssertUtils;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import javax.annotation.Nullable;
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.tuple.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This implements snapshot isolation for transactions.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java
index 0b14b08ab42..baa39839e41 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java
@@ -15,22 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-
-import javax.validation.constraints.NotNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Timer;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSet;
@@ -65,6 +49,19 @@
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import javax.validation.constraints.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /* package */ class SnapshotTransactionManager extends AbstractLockAwareTransactionManager {
     private static final Logger log = LoggerFactory.getLogger(SnapshotTransactionManager.class);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManager.java
index 6ce725cf158..cdd5db4cd5a 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManager.java
@@ -16,17 +16,15 @@
 
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.annotation.Nullable;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nullable;
 
 public final class TransactionConflictDetectionManager {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionLocksCondition.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionLocksCondition.java
index 3e1423875e7..831f65b4935 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionLocksCondition.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionLocksCondition.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Collections;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.transaction.api.TransactionLockTimeoutException;
 import com.palantir.lock.HeldLocksToken;
 import com.palantir.lock.LockService;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.Collections;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TransactionLocksCondition implements AdvisoryLocksCondition {
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java
index 436cb3eb7a0..57aec36b047 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.transaction.api.AutoDelegate_TransactionManager;
 import com.palantir.atlasdb.transaction.api.ConditionAwareTransactionTask;
 import com.palantir.atlasdb.transaction.api.LockAwareTransactionTask;
@@ -28,6 +26,7 @@
 import com.palantir.atlasdb.transaction.api.TransactionTask;
 import com.palantir.lock.HeldLocksToken;
 import com.palantir.lock.LockRequest;
+import java.util.function.Supplier;
 
 public abstract class WrappingTransactionManager implements AutoDelegate_TransactionManager {
     private final TransactionManager delegate;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheck.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheck.java
index 1b2ca20b1e1..22ec9c9314d 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheck.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheck.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.transaction.impl.consistency;
 
-import java.util.function.ToLongFunction;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.factory.ImmutableTransactionManagerConsistencyResult;
 import com.palantir.atlasdb.factory.TransactionManagerConsistencyResult;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.logsafe.SafeArg;
+import java.util.function.ToLongFunction;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Compares a source of fresh timestamps against a conservative lower bound that should always be strictly lower than
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TransactionManagerConsistencyCheck.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TransactionManagerConsistencyCheck.java
index 037cb928f3b..598199b968c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TransactionManagerConsistencyCheck.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/consistency/TransactionManagerConsistencyCheck.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.transaction.impl.consistency;
 
-import java.util.function.Function;
-
 import com.palantir.atlasdb.factory.TransactionManagerConsistencyResult;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.function.Function;
 
 public interface TransactionManagerConsistencyCheck extends
         Function<TransactionManager, TransactionManagerConsistencyResult> {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java
index 9920914a71e..5b380b7e31d 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcome.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.transaction.impl.metrics;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.transaction.api.LockAwareTransactionTask;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.atlasdb.transaction.service.TransactionService;
+import java.util.function.Supplier;
 
 /**
  * A TransactionOutcome describes an outcome resulting from a transaction. Note that a single transaction can
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetrics.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetrics.java
index 2d05c0c3328..4ca24f28228 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetrics.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetrics.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl.metrics;
 
-import java.util.Map;
-import java.util.function.Predicate;
-
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
@@ -26,6 +23,8 @@
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.tritium.metrics.registry.MetricName;
+import java.util.Map;
+import java.util.function.Predicate;
 
 /**
  * Tracks various states of an AtlasDB transaction, and marks associated meters in the
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionService.java
index 03fc39b16cd..1045911e1bd 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionService.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.transaction.service;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import javax.annotation.CheckForNull;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.Futures;
@@ -33,6 +26,11 @@
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import javax.annotation.CheckForNull;
 
 /**
  * This service handles queries for timestamps before {@link AtlasDbConstants#STARTING_TS}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java
index 4fc942b009c..4f2ab88f455 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.service;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.Futures;
@@ -32,6 +29,8 @@
 import com.palantir.atlasdb.transaction.encoding.TimestampEncodingStrategy;
 import com.palantir.atlasdb.transaction.encoding.V1EncodingStrategy;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import java.util.HashMap;
+import java.util.Map;
 
 public final class SimpleTransactionService implements EncodingTransactionService {
     private final KeyValueService kvs;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionService.java
index f9fd767dd8c..f8fd7677990 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionService.java
@@ -16,15 +16,6 @@
 
 package com.palantir.atlasdb.transaction.service;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-
-import javax.annotation.CheckForNull;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
@@ -36,6 +27,13 @@
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import javax.annotation.CheckForNull;
 
 /**
  * A {@link SplitKeyDelegatingTransactionService} delegates between multiple {@link TransactionService}s, depending
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKvsWrapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKvsWrapper.java
index f90a1477e6b..657f306eac2 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKvsWrapper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKvsWrapper.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.service;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import java.util.HashMap;
+import java.util.Map;
 
 public class TransactionKvsWrapper {
     // The maximum key-value store timestamp (exclusive) at which data is stored in transaction table.
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionServices.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionServices.java
index f091473b4fa..66341426e74 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionServices.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionServices.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.service;
 
-import java.util.Map;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -32,6 +30,7 @@
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.timestamp.TimestampService;
+import java.util.Map;
 
 public final class TransactionServices {
     private TransactionServices() {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionService.java
index 8f64971d1dd..7d97fd2435f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionService.java
@@ -16,18 +16,6 @@
 
 package com.palantir.atlasdb.transaction.service;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.CheckForNull;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
@@ -48,6 +36,15 @@
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.annotation.CheckForNull;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class coalesces write (that is, put-unless-exists) requests to an underlying {@link EncodingTransactionService},
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/lock/SingleLockService.java b/atlasdb-impl-shared/src/main/java/com/palantir/lock/SingleLockService.java
index aca90887aeb..1a0e0ed2c86 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/lock/SingleLockService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/lock/SingleLockService.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedMap;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -28,6 +22,10 @@
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("checkstyle:FinalClass") // Used for mocking
 public class SingleLockService implements AutoCloseable {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStoreTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStoreTest.java
index 312d3f34012..12fd12327c6 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStoreTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStoreTest.java
@@ -22,17 +22,15 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
 
 public class KeyValueServicePuncherStoreTest {
     private static final long TIMESTAMP_1 = 10L;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStoreTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStoreTest.java
index 7cdf8df40c6..e496c1acbdd 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStoreTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStoreTest.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.cleaner;
 
-import java.util.List;
-import java.util.SortedMap;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -36,6 +28,12 @@
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.base.BatchingVisitables;
+import java.util.List;
+import java.util.SortedMap;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class KeyValueServiceScrubberStoreTest {
     private KeyValueService kvs;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/ScrubberTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/ScrubberTest.java
index c1a4964868f..4f525b27b6b 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/ScrubberTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/ScrubberTest.java
@@ -20,18 +20,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.function.Function;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
@@ -46,6 +34,16 @@
 import com.palantir.atlasdb.transaction.service.TransactionService;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.common.base.BatchingVisitables;
+import java.util.Collection;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.function.Function;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class ScrubberTest {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/SimplePuncherTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/SimplePuncherTest.java
index 374f66adab1..819ce3de5fd 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/SimplePuncherTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/cleaner/SimplePuncherTest.java
@@ -20,9 +20,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import com.palantir.common.time.Clock;
+import org.junit.Test;
 
 public class SimplePuncherTest {
     @Test
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/BackgroundCompactorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/BackgroundCompactorTest.java
index 4fd74cd5fb9..ec9196ef7d8 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/BackgroundCompactorTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/BackgroundCompactorTest.java
@@ -23,13 +23,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
@@ -37,6 +30,11 @@
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.lock.LockService;
 import com.palantir.lock.SingleLockService;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import org.junit.Before;
+import org.junit.Test;
 
 public class BackgroundCompactorTest {
     private static final String TABLE_STRING = "ns.table";
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/CompactPriorityCalculatorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/CompactPriorityCalculatorTest.java
index 407048fc4f0..771ecc284db 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/CompactPriorityCalculatorTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/compact/CompactPriorityCalculatorTest.java
@@ -19,13 +19,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Optional;
+import org.junit.Test;
 
 public class CompactPriorityCalculatorTest {
     private static final String TABLE_1 = "table1";
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/InternalSchemaConfigTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/InternalSchemaConfigTest.java
index 5ba0b28cbab..ceaa9850924 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/InternalSchemaConfigTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/InternalSchemaConfigTest.java
@@ -19,9 +19,8 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import org.junit.Test;
 
 // In these tests we confirm if config is buildable, so we're interested in exceptions (or lack thereof).
 @SuppressWarnings("ResultOfMethodCallIgnored")
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMapTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMapTest.java
index 3648fcaa658..b34faee79c5 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMapTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TimestampPartitioningMapTest.java
@@ -19,10 +19,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableRangeMap;
 import com.google.common.collect.Range;
+import org.junit.Test;
 
 public class TimestampPartitioningMapTest {
     private static final TimestampPartitioningMap<Integer> DEFAULT_INITIAL_MAPPING
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstallerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstallerTest.java
index fbbbb548dd5..bdcfb16aef9 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstallerTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaInstallerTest.java
@@ -28,7 +28,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.After;
 import org.junit.Test;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerAggressiveConcurrentUpdateTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerAggressiveConcurrentUpdateTest.java
index 2f5c3e3093b..c3fb9e3e5d8 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerAggressiveConcurrentUpdateTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerAggressiveConcurrentUpdateTest.java
@@ -18,6 +18,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Range;
+import com.google.common.collect.RangeMap;
+import com.google.common.util.concurrent.Futures;
+import com.palantir.atlasdb.coordination.ValueAndBound;
+import com.palantir.atlasdb.internalschema.persistence.CoordinationServices;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import com.palantir.atlasdb.util.MetricsManagers;
+import com.palantir.timestamp.InMemoryTimestampService;
+import com.palantir.timestamp.TimestampService;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
@@ -30,21 +41,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Test;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Range;
-import com.google.common.collect.RangeMap;
-import com.google.common.util.concurrent.Futures;
-import com.palantir.atlasdb.coordination.ValueAndBound;
-import com.palantir.atlasdb.internalschema.persistence.CoordinationServices;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
-import com.palantir.atlasdb.util.MetricsManagers;
-import com.palantir.timestamp.InMemoryTimestampService;
-import com.palantir.timestamp.TimestampService;
-
 public class TransactionSchemaManagerAggressiveConcurrentUpdateTest {
     private static final int NUM_THREADS = 8;
 
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerIntegrationTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerIntegrationTest.java
index 1548f418afb..a9ad24c1438 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerIntegrationTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerIntegrationTest.java
@@ -19,15 +19,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.internalschema.persistence.CoordinationServices;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.timestamp.InMemoryTimestampService;
 import com.palantir.timestamp.TimestampService;
+import org.junit.Before;
+import org.junit.Test;
 
 public class TransactionSchemaManagerIntegrationTest {
     private static final long ONE_HUNDRED_MILLION = 100_000_000;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerTest.java
index e8586153ab7..4a1fb6aed7a 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/TransactionSchemaManagerTest.java
@@ -20,16 +20,14 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableRangeMap;
 import com.google.common.collect.Range;
 import com.palantir.atlasdb.coordination.CoordinationService;
 import com.palantir.atlasdb.coordination.ValueAndBound;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Optional;
+import org.junit.Test;
 
 @SuppressWarnings("unchecked") // Mocks of generic types
 public class TransactionSchemaManagerTest {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetricsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetricsTest.java
index b072e664238..e7079d8353e 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetricsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/metrics/MetadataCoordinationServiceMetricsTest.java
@@ -22,11 +22,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.BoundType;
@@ -40,6 +35,9 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.timestamp.TimestampService;
+import java.util.Optional;
+import org.junit.Before;
+import org.junit.Test;
 
 @SuppressWarnings("unchecked") // Mocks
 public class MetadataCoordinationServiceMetricsTest {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodecTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodecTest.java
index 635bdf2f4fc..28f2b2aff40 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodecTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/InternalSchemaMetadataPayloadCodecTest.java
@@ -19,20 +19,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.google.common.collect.ImmutableRangeMap;
+import com.google.common.collect.Range;
+import com.palantir.atlasdb.internalschema.InternalSchemaMetadata;
+import com.palantir.atlasdb.internalschema.TimestampPartitioningMap;
+import com.palantir.conjure.java.serialization.ObjectMappers;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Objects;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableRangeMap;
-import com.google.common.collect.Range;
-import com.palantir.atlasdb.internalschema.InternalSchemaMetadata;
-import com.palantir.atlasdb.internalschema.TimestampPartitioningMap;
-import com.palantir.conjure.java.serialization.ObjectMappers;
-
 public class InternalSchemaMetadataPayloadCodecTest {
     private static final InternalSchemaMetadata INTERNAL_SCHEMA_METADATA = InternalSchemaMetadata.builder()
             .timestampToTransactionsTableSchemaVersion(
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadataTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadataTest.java
index 201cd3419ea..5c35ee24743 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadataTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/internalschema/persistence/VersionedInternalSchemaMetadataTest.java
@@ -24,7 +24,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Objects;
-
 import org.junit.Test;
 
 public class VersionedInternalSchemaMetadataTest {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersisterTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersisterTest.java
index 5431d126f44..56f4ff740aa 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersisterTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/api/WriteReferencePersisterTest.java
@@ -17,13 +17,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.nio.charset.StandardCharsets;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.ptobject.EncodingUtils;
 import com.palantir.atlasdb.sweep.queue.id.SweepTableIndices;
+import java.nio.charset.StandardCharsets;
+import org.junit.Test;
 
 public final class WriteReferencePersisterTest {
     private static final TableReference TABLE = TableReference.create(
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingServiceTest.java
index 1a06fa0fd13..99693744216 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingServiceTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/KvTableMappingServiceTest.java
@@ -26,12 +26,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
@@ -42,6 +36,10 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.common.exception.TableMappingNotFoundException;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+import org.junit.Before;
+import org.junit.Test;
 
 public class KvTableMappingServiceTest {
     private static final TableReference FQ_TABLE = TableReference.createFromFullyQualifiedName("test.test");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueServiceTest.java
index da10873d5a1..6fcce9ee62d 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueServiceTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueServiceTest.java
@@ -18,18 +18,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.Futures;
@@ -43,6 +31,16 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+import org.junit.Test;
 
 public class TableRemappingKeyValueServiceTest {
     private static final Namespace NAMESPACE = Namespace.create("namespace");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfigTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfigTest.java
index 4f7437b5c54..b8d3ee348b4 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfigTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfigTest.java
@@ -17,9 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.spi.KeyValueServiceConfigHelper;
+import org.junit.Test;
 
 public class InMemoryAtlasDbConfigTest {
     private static final InMemoryAtlasDbConfig CONFIG_1 = new InMemoryAtlasDbConfig();
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java
index 8c62c171e72..fa58b64eb2d 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java
@@ -18,13 +18,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.spi.AtlasDbFactory;
 import com.palantir.timestamp.TimestampService;
+import java.util.Optional;
+import org.junit.Test;
 
 public class InMemoryAtlasDbFactoryTest {
     private final AtlasDbFactory factory = new InMemoryAtlasDbFactory();
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TimestampTrackerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TimestampTrackerTest.java
index 7e1c179dea9..6f0994fca61 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TimestampTrackerTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TimestampTrackerTest.java
@@ -21,11 +21,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
 import com.codahale.metrics.Clock;
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
@@ -34,6 +29,9 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.lock.v2.TimelockService;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import org.junit.Test;
 
 public class TimestampTrackerTest {
     private static final long ONE = 1L;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TrackerUtilsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TrackerUtilsTest.java
index 13cb2c427e1..69e44bc49b2 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TrackerUtilsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/monitoring/TrackerUtilsTest.java
@@ -22,15 +22,13 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.codahale.metrics.Clock;
+import com.codahale.metrics.Gauge;
 import java.util.function.Supplier;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.codahale.metrics.Clock;
-import com.codahale.metrics.Gauge;
-
 @SuppressWarnings("unchecked") // Mocks of known types
 public class TrackerUtilsTest {
     private static final Logger log = LoggerFactory.getLogger(TrackerUtilsTest.class);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceClientTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceClientTest.java
index 08c787e3e9a..f765188cb50 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceClientTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceClientTest.java
@@ -18,20 +18,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import java.util.UUID;
-
-import javax.ws.rs.core.Response;
-
-import org.junit.After;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.util.TestJaxRsClientFactory;
 import com.palantir.conjure.java.api.errors.RemoteException;
 import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature;
-
 import io.dropwizard.testing.junit.DropwizardClientRule;
+import java.util.UUID;
+import javax.ws.rs.core.Response;
+import org.junit.After;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class KvsBackedPersistentLockServiceClientTest {
     private static final String REASON = "some-reason";
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceTest.java
index a87b1b324b3..e526b57e864 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/KvsBackedPersistentLockServiceTest.java
@@ -21,13 +21,12 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.keyvalue.api.CheckAndSetException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import org.junit.Before;
+import org.junit.Test;
 
 public class KvsBackedPersistentLockServiceTest {
     private static final String TEST_REASON = "for-test";
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockEntryTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockEntryTest.java
index 845eecd6923..8dafe6e2742 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockEntryTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockEntryTest.java
@@ -18,13 +18,6 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Iterator;
-import java.util.UUID;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableSet;
@@ -38,6 +31,11 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Iterator;
+import java.util.UUID;
+import org.junit.Test;
 
 public class LockEntryTest {
     private static final ObjectMapper MAPPER = new ObjectMapper();
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockStoreTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockStoreTest.java
index aba89436fe1..726bebb9a83 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockStoreTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/LockStoreTest.java
@@ -25,16 +25,14 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-import java.util.Set;
-import java.util.UUID;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.CheckAndSetException;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import java.util.Set;
+import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
 
 public class LockStoreTest {
     private static final String REASON = "reason";
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/PersistentLockServiceClientTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/PersistentLockServiceClientTest.java
index d14944b71fa..803761760f3 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/PersistentLockServiceClientTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/persistentlock/PersistentLockServiceClientTest.java
@@ -18,20 +18,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import java.util.UUID;
-
-import javax.ws.rs.core.Response;
-
-import org.junit.After;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.util.TestJaxRsClientFactory;
 import com.palantir.conjure.java.api.errors.RemoteException;
 import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature;
-
 import io.dropwizard.testing.junit.DropwizardClientRule;
+import java.util.UUID;
+import javax.ws.rs.core.Response;
+import org.junit.After;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class PersistentLockServiceClientTest {
     private static final String REASON = "some-reason";
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorsTest.java
index 3dc0c505742..eb562fafef5 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceMigratorsTest.java
@@ -18,18 +18,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
-import java.util.Set;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Set;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class KeyValueServiceMigratorsTest {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceValidatorsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceValidatorsTest.java
index c35870ddba2..0f2eb12cae7 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceValidatorsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/schema/KeyValueServiceValidatorsTest.java
@@ -17,8 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -27,6 +25,7 @@
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.schema.generated.SweepPriorityTable;
 import com.palantir.atlasdb.transaction.impl.TransactionTables;
+import org.junit.Test;
 
 public class KeyValueServiceValidatorsTest {
     private static final TableReference SWEEP_PRIORITY = TableReference.create(
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSourceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSourceTest.java
index 1232655eb5f..9a051d58483 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSourceTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/AdjustableSweepBatchConfigSourceTest.java
@@ -24,12 +24,10 @@
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.junit.Assert.assertThat;
 
+import com.palantir.atlasdb.util.MetricsManagers;
 import java.util.function.Function;
-
 import org.junit.Test;
 
-import com.palantir.atlasdb.util.MetricsManagers;
-
 /**
  * Created by tboam on 03/11/2017.
  */
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/BackgroundSweeperFastTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/BackgroundSweeperFastTest.java
index fe53012bcc1..e0f6d9d7d9f 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/BackgroundSweeperFastTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/BackgroundSweeperFastTest.java
@@ -18,20 +18,18 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 
-import java.util.Optional;
-
-import org.assertj.core.api.Assertions;
-import org.assertj.core.data.Percentage;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
 import com.palantir.atlasdb.sweep.priority.ImmutableSweepPriorityOverrideConfig;
 import com.palantir.atlasdb.sweep.priority.ImmutableUpdateSweepPriority;
 import com.palantir.atlasdb.sweep.progress.ImmutableSweepProgress;
 import com.palantir.atlasdb.sweep.progress.SweepProgress;
+import java.util.Optional;
+import org.assertj.core.api.Assertions;
+import org.assertj.core.data.Percentage;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 
 public class BackgroundSweeperFastTest extends SweeperTestSetup {
 
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsSweeperShould.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsSweeperShould.java
index bbf7045d9de..7defd7d04d6 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsSweeperShould.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsSweeperShould.java
@@ -26,12 +26,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Set;
-
-import org.junit.Test;
-import org.mockito.InOrder;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -42,6 +36,10 @@
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
+import java.nio.charset.StandardCharsets;
+import java.util.Set;
+import org.junit.Test;
+import org.mockito.InOrder;
 
 public class CellsSweeperShould {
     private static final TableReference TABLE_REFERENCE = TableReference.create(Namespace.create("ns"), "testTable");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIteratorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIteratorTest.java
index 49089433f8d..549230185e0 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIteratorTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CellsToSweepPartitioningIteratorTest.java
@@ -17,17 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Ints;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
 
 public class CellsToSweepPartitioningIteratorTest {
     @Test(expected = IllegalArgumentException.class)
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CommitTsCacheTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CommitTsCacheTest.java
index 3a904491f24..5d756345c6f 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CommitTsCacheTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/CommitTsCacheTest.java
@@ -27,22 +27,20 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.Sets;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
+import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import com.palantir.atlasdb.transaction.service.TransactionService;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
-
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 
-import com.google.common.collect.Sets;
-import com.palantir.atlasdb.AtlasDbConstants;
-import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
-import com.palantir.atlasdb.transaction.impl.TransactionConstants;
-import com.palantir.atlasdb.transaction.service.TransactionService;
-
 public class CommitTsCacheTest {
     private static final Long VALID_START_TIMESTAMP = 100L;
     private static final Long VALID_COMMIT_TIMESTAMP = 200L;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/ExaminedCellLimitTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/ExaminedCellLimitTest.java
index b0fff3c7847..c212746b038 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/ExaminedCellLimitTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/ExaminedCellLimitTest.java
@@ -18,9 +18,8 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import org.junit.Test;
 
 public class ExaminedCellLimitTest {
     private String startingRow;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/PersistentLockManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/PersistentLockManagerTest.java
index 07f97f6d544..33a829c7c54 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/PersistentLockManagerTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/PersistentLockManagerTest.java
@@ -31,14 +31,6 @@
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -51,8 +43,13 @@
 import com.palantir.atlasdb.persistentlock.PersistentLockService;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
-
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import net.jcip.annotations.GuardedBy;
+import org.junit.Before;
+import org.junit.Test;
 
 public class PersistentLockManagerTest {
     private static final PersistentLockId FIRST_LOCK_ID = PersistentLockId.fromString("2-4-6-0-1");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTimestampTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTimestampTest.java
index a52dd61f961..9cd299ed3fe 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTimestampTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTimestampTest.java
@@ -19,12 +19,10 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.palantir.atlasdb.sweep.queue.SpecialTimestampsSupplier;
 import java.util.function.LongSupplier;
-
 import org.junit.Test;
 
-import com.palantir.atlasdb.sweep.queue.SpecialTimestampsSupplier;
-
 public class SweepTimestampTest {
     private final LongSupplier mockImmutableTimestampSupplier = mock(LongSupplier.class);
     private final LongSupplier mockUnreadableTimestampSupplier = mock(LongSupplier.class);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterParametrizedTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterParametrizedTest.java
index 769deb810ad..4d2967a0b4d 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterParametrizedTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterParametrizedTest.java
@@ -20,6 +20,15 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping;
+import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import com.palantir.atlasdb.transaction.service.TransactionService;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,22 +37,11 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-import com.palantir.atlasdb.keyvalue.api.CandidateCellForSweeping;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.ImmutableCandidateCellForSweeping;
-import com.palantir.atlasdb.transaction.impl.TransactionConstants;
-import com.palantir.atlasdb.transaction.service.TransactionService;
-
 @RunWith(Parameterized.class)
 public class SweepableCellFilterParametrizedTest {
     private static final Set<Boolean> BOOLEANS = ImmutableSet.of(true, false);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterTest.java
index ef8096cf52c..16328645131 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepableCellFilterTest.java
@@ -20,11 +20,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -34,6 +29,9 @@
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.atlasdb.transaction.service.TransactionService;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import org.junit.Test;
 
 public class SweepableCellFilterTest {
     private static final long LOW_START_TS = 6L;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperServiceImplTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperServiceImplTest.java
index 1553c9fd331..f385697bb7c 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperServiceImplTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperServiceImplTest.java
@@ -25,18 +25,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.ws.rs.core.Response;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.BaseEncoding;
@@ -47,6 +35,15 @@
 import com.palantir.atlasdb.util.TestJaxRsClientFactory;
 import com.palantir.conjure.java.api.errors.RemoteException;
 import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature;
+import java.util.List;
+import java.util.Optional;
+import javax.ws.rs.core.Response;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 
 public class SweeperServiceImplTest extends SweeperTestSetup {
 
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperTestSetup.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperTestSetup.java
index 5ab71b63cf9..0732c8f4ec1 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperTestSetup.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweeperTestSetup.java
@@ -22,13 +22,6 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
-import java.util.Optional;
-import java.util.concurrent.CountDownLatch;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.mockito.stubbing.Answer;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -46,6 +39,11 @@
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.lock.LockService;
 import com.palantir.lock.SingleLockService;
+import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.mockito.stubbing.Answer;
 
 public class SweeperTestSetup {
     protected static final TableReference TABLE_REF = TableReference.createFromFullyQualifiedName(
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetricsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetricsTest.java
index 25035804359..fb408be0ee6 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetricsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/LegacySweepMetricsTest.java
@@ -17,17 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.AtlasDbMetricNames;
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
 
 public class LegacySweepMetricsTest {
     private static final long EXAMINED = 15L;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepMetricsAssert.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepMetricsAssert.java
index 4bf1371aed5..46c21613a44 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepMetricsAssert.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepMetricsAssert.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.metrics;
 
-import java.util.Map;
-
-import javax.annotation.CheckReturnValue;
-
-import org.assertj.core.api.AbstractAssert;
-import org.assertj.core.api.WritableAssertionInfo;
-import org.assertj.core.data.Offset;
-import org.assertj.core.internal.Doubles;
-import org.assertj.core.internal.LongArrays;
-import org.assertj.core.internal.Objects;
-
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Snapshot;
@@ -36,6 +25,14 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.SlidingWindowMeanGauge;
 import com.palantir.tritium.metrics.registry.MetricName;
+import java.util.Map;
+import javax.annotation.CheckReturnValue;
+import org.assertj.core.api.AbstractAssert;
+import org.assertj.core.api.WritableAssertionInfo;
+import org.assertj.core.data.Offset;
+import org.assertj.core.internal.Doubles;
+import org.assertj.core.internal.LongArrays;
+import org.assertj.core.internal.Objects;
 
 public final class SweepMetricsAssert extends AbstractAssert<SweepMetricsAssert, MetricsManager> {
     private final MetricsManager metrics;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetricsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetricsTest.java
index 58786334b4d..ec131365175 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetricsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/SweepOutcomeMetricsTest.java
@@ -15,23 +15,20 @@
  */
 package com.palantir.atlasdb.sweep.metrics;
 
-import static org.mockito.Mockito.mock;
-
 import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.CONSERVATIVE;
 import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.THOROUGH;
 import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat;
-
-import java.util.Arrays;
-import java.util.stream.IntStream;
-
-import org.junit.Before;
-import org.junit.Test;
+import static org.mockito.Mockito.mock;
 
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.sweep.queue.ShardAndStrategy;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.lock.v2.TimelockService;
+import java.util.Arrays;
+import java.util.stream.IntStream;
+import org.junit.Before;
+import org.junit.Test;
 
 public class SweepOutcomeMetricsTest {
     private MetricsManager metricsManager;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetricsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetricsTest.java
index 3f863b89bc6..414fcd089ee 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetricsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/metrics/TargetedSweepMetricsTest.java
@@ -15,20 +15,13 @@
  */
 package com.palantir.atlasdb.sweep.metrics;
 
+import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat;
-
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cleaner.KeyValueServicePuncherStore;
 import com.palantir.atlasdb.cleaner.PuncherStore;
@@ -38,6 +31,10 @@
 import com.palantir.atlasdb.sweep.queue.ShardAndStrategy;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
+import java.util.concurrent.TimeUnit;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
 
 public class TargetedSweepMetricsTest {
     private static final long RECOMPUTE_MILLIS = 10;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProviderTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProviderTest.java
index 69fe4bc3a3c..d55e65c1c2a 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProviderTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/NextTableToSweepProviderTest.java
@@ -24,6 +24,14 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.sweep.TableToSweep;
+import com.palantir.lock.LockRefreshToken;
+import com.palantir.lock.LockRequest;
+import com.palantir.lock.LockService;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,20 +40,10 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.IntStream;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.palantir.atlasdb.keyvalue.api.Namespace;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.sweep.TableToSweep;
-import com.palantir.lock.LockRefreshToken;
-import com.palantir.lock.LockRequest;
-import com.palantir.lock.LockService;
-
 public class NextTableToSweepProviderTest {
     private NextTableToSweepProvider provider;
 
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculatorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculatorTest.java
index 7c0986f0baf..f1348d1ac36 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculatorTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculatorTest.java
@@ -22,6 +22,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.schema.stream.StreamTableType;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,17 +34,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.atlasdb.AtlasDbConstants;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.api.Namespace;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.schema.stream.StreamTableType;
-
 public class StreamStoreRemappingSweepPriorityCalculatorTest {
     private static final long THIRTY_MINUTES_AGO = ZonedDateTime.now().minusMinutes(30).toInstant().toEpochMilli();
     private static final long TWO_HOURS_AGO = ZonedDateTime.now().minusHours(2).toInstant().toEpochMilli();
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/AbstractSweepQueueTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/AbstractSweepQueueTest.java
index 9bbb262c7da..cc5009f1f80 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/AbstractSweepQueueTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/AbstractSweepQueueTest.java
@@ -17,14 +17,6 @@
 
 import static org.mockito.Mockito.spy;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Before;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -42,6 +34,12 @@
 import com.palantir.atlasdb.transaction.service.TransactionServices;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import org.assertj.core.api.Assertions;
+import org.junit.After;
+import org.junit.Before;
 
 public abstract class AbstractSweepQueueTest {
     static final TableReference TABLE_CONS = TableReference.createFromFullyQualifiedName("test.conservative");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategyTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategyTest.java
index 9b407f8f150..e6f64f1364f 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategyTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardAndStrategyTest.java
@@ -17,9 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
+import org.junit.Test;
 
 public class ShardAndStrategyTest {
 
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardProgressTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardProgressTest.java
index 526015e3249..8f5e81a28b7 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardProgressTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/ShardProgressTest.java
@@ -23,9 +23,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -35,6 +32,8 @@
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.schema.generated.SweepShardProgressTable;
+import org.junit.Before;
+import org.junit.Test;
 
 public class ShardProgressTest {
     private static final long INITIAL_TIMESTAMP = SweepQueueUtils.INITIAL_TIMESTAMP;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulatorTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulatorTest.java
index 48854913ee5..dfd922d5336 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulatorTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchAccumulatorTest.java
@@ -19,19 +19,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.LongStream;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.schema.generated.SweepableCellsTable;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+import org.junit.Before;
+import org.junit.Test;
 
 public class SweepBatchAccumulatorTest {
     private static final long SWEEP_TIMESTAMP = 3141592L;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfoTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfoTest.java
index 5c4ec066572..ea806ab5e95 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfoTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepBatchWithPartitionInfoTest.java
@@ -20,12 +20,10 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
 import java.util.Set;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-
 public class SweepBatchWithPartitionInfoTest {
     private final SweepBatch batch = mock(SweepBatch.class);
 
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableCellsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableCellsTest.java
index 4e94120bef4..7a658a77f5a 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableCellsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableCellsTest.java
@@ -15,6 +15,12 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
+import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.conservative;
+import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.thorough;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_DEDICATED;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_GENERIC;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.SWEEP_BATCH_SIZE;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
@@ -24,23 +30,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.conservative;
-import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.thorough;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_DEDICATED;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_GENERIC;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.SWEEP_BATCH_SIZE;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.LongStream;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
@@ -53,6 +42,14 @@
 import com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert;
 import com.palantir.atlasdb.sweep.metrics.TargetedSweepMetrics;
 import com.palantir.lock.v2.TimelockService;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 public class SweepableCellsTest extends AbstractSweepQueueTest {
     private static final long SMALL_SWEEP_TS = TS + 200L;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableTimestampsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableTimestampsTest.java
index 2f29cf975f0..423986418c2 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableTimestampsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableTimestampsTest.java
@@ -15,22 +15,19 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.conservative;
 import static com.palantir.atlasdb.sweep.queue.ShardAndStrategy.thorough;
 import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_FINE_GRANULARITY;
 import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.maxTsForFinePartition;
 import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForFinePartition;
 import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine;
+import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.sweep.Sweeper;
 import java.util.Optional;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.atlasdb.sweep.Sweeper;
-
 public class SweepableTimestampsTest extends AbstractSweepQueueTest {
     private ShardProgress progress;
     private SweepableTimestamps sweepableTimestamps;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLockTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLockTest.java
index a670f7bd8d7..e4a82a30360 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLockTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperLockTest.java
@@ -23,15 +23,13 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-import java.util.UUID;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimelockService;
+import java.util.Optional;
+import java.util.UUID;
+import org.junit.Test;
 
 public class TargetedSweeperLockTest {
     private TimelockService mockLockService = mock(TimelockService.class);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperNumShardSupplierTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperNumShardSupplierTest.java
index 6e7923845c4..b00bba41df4 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperNumShardSupplierTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperNumShardSupplierTest.java
@@ -23,14 +23,12 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.function.Supplier;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import java.util.function.Supplier;
+import org.junit.Before;
+import org.junit.Test;
 
 public class TargetedSweeperNumShardSupplierTest {
     private KeyValueService kvs;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperTest.java
index cb91f8c3595..5d91bb2f758 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweeperTest.java
@@ -15,6 +15,18 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
+import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.CONSERVATIVE;
+import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.THOROUGH;
+import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.BATCH_SIZE_KVS;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_GENERIC;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.SWEEP_BATCH_SIZE;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_COARSE_GRANULARITY;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_FINE_GRANULARITY;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.maxTsForFinePartition;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForCoarsePartition;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForFinePartition;
+import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
@@ -30,38 +42,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.CONSERVATIVE;
-import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.THOROUGH;
-import static com.palantir.atlasdb.sweep.metrics.SweepMetricsAssert.assertThat;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.BATCH_SIZE_KVS;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.MAX_CELLS_GENERIC;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.SWEEP_BATCH_SIZE;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_COARSE_GRANULARITY;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.TS_FINE_GRANULARITY;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.maxTsForFinePartition;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForCoarsePartition;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.minTsForFinePartition;
-import static com.palantir.atlasdb.sweep.queue.SweepQueueUtils.tsPartitionFine;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.eclipse.jetty.util.ConcurrentHashSet;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -96,6 +76,23 @@
 import com.palantir.lock.v2.LockResponse;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimelockService;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.eclipse.jetty.util.ConcurrentHashSet;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.mockito.ArgumentCaptor;
 
 @RunWith(Parameterized.class)
 public class TargetedSweeperTest extends AbstractSweepQueueTest {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitionerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitionerTest.java
index 43dcd91b26d..c3b1aeb5312 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitionerTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoPartitionerTest.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.atlasdb.sweep.queue;
 
+import static com.palantir.atlasdb.sweep.queue.AbstractSweepQueueTest.metadataBytes;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
@@ -24,15 +25,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import static com.palantir.atlasdb.sweep.queue.AbstractSweepQueueTest.metadataBytes;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -43,6 +35,11 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
 
 public class WriteInfoPartitionerTest {
     private static final TableReference NOTHING = getTableRef("nothing");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoTest.java
index 9f411a2a58e..3dc742f12d6 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/WriteInfoTest.java
@@ -17,11 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.sweep.Sweeper;
+import org.junit.Test;
 
 public class WriteInfoTest {
     private static final TableReference TABLE_REF = TableReference.createFromFullyQualifiedName("test.test");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStoreTests.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStoreTests.java
index c69a183805a..5d9fae52a37 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStoreTests.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultConservativeSweepWatermarkStoreTests.java
@@ -18,9 +18,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
@@ -28,6 +25,8 @@
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.schema.TargetedSweepSchema;
 import com.palantir.atlasdb.table.description.Schemas;
+import org.junit.Before;
+import org.junit.Test;
 
 public class DefaultConservativeSweepWatermarkStoreTests {
     private static final TableReference TABLE = TableReference.create(Namespace.create("foo"), "bar");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearerTests.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearerTests.java
index dad5f3a0725..117cdbfeb7c 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearerTests.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/clear/DefaultTableClearerTests.java
@@ -21,12 +21,6 @@
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -37,6 +31,11 @@
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
 import com.palantir.atlasdb.sweep.queue.WriteInfo;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public final class DefaultTableClearerTests {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/IdsToNamesTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/IdsToNamesTest.java
index 2f8728e81cb..9d7083e53ea 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/IdsToNamesTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/IdsToNamesTest.java
@@ -17,12 +17,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import org.junit.Test;
 
 public final class IdsToNamesTest {
     private final KeyValueService kvs = new InMemoryKeyValueService(true);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/NamesToIdsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/NamesToIdsTest.java
index e08055eda7b..2cfaf93a57e 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/NamesToIdsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/NamesToIdsTest.java
@@ -18,12 +18,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import org.junit.Test;
 
 public final class NamesToIdsTest {
     private static final TableReference TABLE = TableReference.create(Namespace.create("namespace"), "table");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndicesTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndicesTest.java
index 7a7547f18ee..2059c606201 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndicesTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIndicesTest.java
@@ -18,14 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import java.util.NoSuchElementException;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import java.util.NoSuchElementException;
+import org.junit.Test;
 
 public class SweepTableIndicesTest {
     private final KeyValueService kvs = new InMemoryKeyValueService(true);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategyTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategyTest.java
index a9d17c052f5..b541a06a710 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategyTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategyTest.java
@@ -19,6 +19,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
+import com.google.protobuf.ByteString;
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -27,14 +31,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
-
 import org.junit.Test;
 
-import com.google.protobuf.ByteString;
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.transaction.impl.TransactionConstants;
-
 public class TicketsEncodingStrategyTest {
     private static final TicketsEncodingStrategy STRATEGY = TicketsEncodingStrategy.INSTANCE;
 
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java
index 2a960cf09e5..f1b21a5447b 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/AdvisoryLocksConditionTest.java
@@ -22,14 +22,6 @@
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.palantir.atlasdb.transaction.api.LockAcquisitionException;
@@ -47,6 +39,12 @@
 import com.palantir.lock.SimpleTimeDuration;
 import com.palantir.lock.SortedLockCollection;
 import com.palantir.lock.TimeDuration;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AdvisoryLocksConditionTest {
 
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutorsTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutorsTest.java
index 9fc118e399c..838e45874b4 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutorsTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/DefaultTaskExecutorsTest.java
@@ -18,14 +18,12 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 
-import com.google.common.util.concurrent.Uninterruptibles;
-
 public class DefaultTaskExecutorsTest {
     @Test
     public void deleteExecutorHasBoundedTaskQueue() {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/LockCheckingTransactionTaskTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/LockCheckingTransactionTaskTest.java
index 2a3b940485c..101480309ac 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/LockCheckingTransactionTaskTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/LockCheckingTransactionTaskTest.java
@@ -25,11 +25,6 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.internal.verification.VerificationModeFactory.times;
 
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionFailedNonRetriableException;
@@ -37,6 +32,9 @@
 import com.palantir.atlasdb.transaction.api.TransactionTask;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimelockService;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
 
 public class LockCheckingTransactionTaskTest {
     private final TimelockService timelockService = mock(TimelockService.class);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManagerTest.java
index a4c19d32033..ade783d2be1 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManagerTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SerializableTransactionManagerTest.java
@@ -28,15 +28,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.awaitility.Awaitility;
-import org.jmock.lib.concurrent.DeterministicScheduler;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.async.initializer.AsyncInitializer;
 import com.palantir.async.initializer.Callback;
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
@@ -54,6 +45,13 @@
 import com.palantir.exception.NotInitializedException;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.TimestampManagementService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.jmock.lib.concurrent.DeterministicScheduler;
+import org.junit.Before;
+import org.junit.Test;
 
 public class SerializableTransactionManagerTest {
     private static final long THREE = 3L;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManagerTest.java
index 0f416baa11b..d171056dddb 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManagerTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManagerTest.java
@@ -27,14 +27,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.junit.Test;
-import org.mockito.InOrder;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
 import com.palantir.atlasdb.cleaner.api.Cleaner;
@@ -53,6 +45,12 @@
 import com.palantir.lock.impl.LegacyTimelockService;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.InMemoryTimestampService;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.junit.Test;
+import org.mockito.InOrder;
 
 public class SnapshotTransactionManagerTest {
     private static final String SETUP_TASK_METRIC_NAME =
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManagerTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManagerTest.java
index 051f9afd21b..8285afd2be5 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManagerTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionConflictDetectionManagerTest.java
@@ -16,26 +16,23 @@
 
 package com.palantir.atlasdb.transaction.impl;
 
+import static com.palantir.logsafe.testing.Assertions.assertThatLoggableExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.when;
 
-import static com.palantir.logsafe.testing.Assertions.assertThatLoggableExceptionThrownBy;
-
-import javax.annotation.Nullable;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.cache.CacheLoader;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.logsafe.exceptions.SafeNullPointerException;
+import javax.annotation.Nullable;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public final class TransactionConflictDetectionManagerTest {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheckTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheckTest.java
index ea1e1461ee7..5a53fd69459 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheckTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/consistency/TimestampCorroborationConsistencyCheckTest.java
@@ -18,13 +18,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import java.util.function.ToLongFunction;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.factory.ImmutableTransactionManagerConsistencyResult;
 import com.palantir.atlasdb.factory.TransactionManagerConsistencyResult;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.function.ToLongFunction;
+import org.junit.Test;
 
 public class TimestampCorroborationConsistencyCheckTest {
     private static final RuntimeException EXCEPTION = new IllegalStateException("bad");
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionServiceTest.java
index 34e28867a22..a0d3b1c145d 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionServiceTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/PreStartHandlingTransactionServiceTest.java
@@ -26,19 +26,17 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-import java.util.Map;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.List;
+import java.util.Map;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class PreStartHandlingTransactionServiceTest {
     private final TransactionService delegate = mock(TransactionService.class);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/ReadOnlyTransactionServiceIntegrationTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/ReadOnlyTransactionServiceIntegrationTest.java
index 5e62e9748ee..ab41e70924b 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/ReadOnlyTransactionServiceIntegrationTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/ReadOnlyTransactionServiceIntegrationTest.java
@@ -18,13 +18,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.timestamp.InMemoryTimestampService;
+import org.junit.Test;
 
 public class ReadOnlyTransactionServiceIntegrationTest {
     private static final long COORDINATION_QUANTUM = 100_000_000L;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionServiceTest.java
index 486136322cb..c5fac122dc6 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionServiceTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/SplitKeyDelegatingTransactionServiceTest.java
@@ -23,18 +23,16 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.math.LongMath;
 import java.util.Map;
 import java.util.function.Function;
-
 import org.junit.After;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.math.LongMath;
-
 @SuppressWarnings("unchecked") // Mocking
 public class SplitKeyDelegatingTransactionServiceTest {
     private static final Function<Long, Long> EXTRACT_LAST_DIGIT = num -> LongMath.mod(num, 10L);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/TransactionServicesTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/TransactionServicesTest.java
index 320d6e9129d..69074e19538 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/TransactionServicesTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/TransactionServicesTest.java
@@ -24,14 +24,6 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.awaitility.Awaitility;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
 import com.palantir.atlasdb.coordination.CoordinationService;
 import com.palantir.atlasdb.internalschema.InternalSchemaMetadata;
 import com.palantir.atlasdb.internalschema.TransactionSchemaManager;
@@ -50,6 +42,12 @@
 import com.palantir.timestamp.InMemoryTimestampService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 public class TransactionServicesTest {
     private final KeyValueService keyValueService = spy(new InMemoryKeyValueService(false));
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionServiceTest.java
index de1771b8d97..2439119a470 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionServiceTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/service/WriteBatchingTransactionServiceTest.java
@@ -30,17 +30,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.immutables.value.Value;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.SettableFuture;
@@ -51,6 +40,15 @@
 import com.palantir.atlasdb.transaction.encoding.V1EncodingStrategy;
 import com.palantir.common.annotation.Output;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.immutables.value.Value;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class WriteBatchingTransactionServiceTest {
     private static final V1EncodingStrategy ENCODING_STRATEGY = V1EncodingStrategy.INSTANCE;
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/DropwizardClientRule.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/DropwizardClientRule.java
index e929bf7801e..f0af37f5791 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/DropwizardClientRule.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/DropwizardClientRule.java
@@ -15,13 +15,8 @@
  */
 package com.palantir.atlasdb.util;
 
-import java.net.URI;
-
-import org.junit.rules.ExternalResource;
-
 import com.codahale.metrics.health.HealthCheck;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-
 import io.dropwizard.Application;
 import io.dropwizard.Configuration;
 import io.dropwizard.jetty.HttpConnectorFactory;
@@ -29,6 +24,8 @@
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.dropwizard.testing.DropwizardTestSupport;
+import java.net.URI;
+import org.junit.rules.ExternalResource;
 
 /**
  * Copied from {@link io.dropwizard.testing.junit.DropwizardClientRule} so that we can configure the ObjectMapper.
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/TestJaxRsClientFactory.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/TestJaxRsClientFactory.java
index ab19dfff06e..5d9e7ca5648 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/TestJaxRsClientFactory.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/util/TestJaxRsClientFactory.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.util;
 
-import java.nio.file.Paths;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.conjure.java.api.config.service.UserAgents;
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
@@ -25,8 +23,8 @@
 import com.palantir.conjure.java.client.jaxrs.JaxRsClient;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
 import com.palantir.conjure.java.okhttp.NoOpHostEventsSink;
-
 import io.dropwizard.testing.ResourceHelpers;
+import java.nio.file.Paths;
 
 public final class TestJaxRsClientFactory {
     private TestJaxRsClientFactory() {
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/lock/SimpleLocksTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/lock/SimpleLocksTest.java
index 0a5d0cbd001..418efbf5ed4 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/lock/SimpleLocksTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/lock/SimpleLocksTest.java
@@ -25,14 +25,12 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import java.math.BigInteger;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
 public class SimpleLocksTest {
     private SingleLockService lockService;
     private LockService mockLockService = mock(LockService.class);
diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java
index 95fb3aaf57e..e9e639e4989 100644
--- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java
+++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcKeyValueSharedTest.java
@@ -17,11 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueServiceTest;
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class JdbcKeyValueSharedTest extends AbstractKeyValueServiceTest {
     @ClassRule
diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweepTaskRunnerTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweepTaskRunnerTest.java
index 287d56e393e..cae747b1b62 100644
--- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweepTaskRunnerTest.java
+++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweepTaskRunnerTest.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.jdbc;
 
-import org.junit.After;
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest;
+import org.junit.After;
+import org.junit.ClassRule;
 
 public class JdbcSweepTaskRunnerTest extends AbstractSweepTaskRunnerTest {
     @ClassRule
diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTests.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTests.java
index eccdefebc14..a4ee9de9696 100644
--- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTests.java
+++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTests.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.jdbc;
 
-import java.io.File;
-import java.util.Properties;
-
 import com.palantir.atlasdb.jdbc.config.ImmutableHikariDataSourceConfiguration;
 import com.palantir.atlasdb.keyvalue.jdbc.ImmutableJdbcKeyValueConfiguration;
 import com.palantir.atlasdb.keyvalue.jdbc.JdbcKeyValueConfiguration;
 import com.palantir.atlasdb.keyvalue.jdbc.JdbcKeyValueService;
+import java.io.File;
+import java.util.Properties;
 
 public class JdbcTests {
 
diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTimestampBoundStoreTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTimestampBoundStoreTest.java
index 515fd7f48bf..a87b02230bf 100644
--- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTimestampBoundStoreTest.java
+++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTimestampBoundStoreTest.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.jdbc;
 
-import org.junit.After;
-
 import com.palantir.atlasdb.keyvalue.jdbc.JdbcKeyValueService;
 import com.palantir.atlasdb.keyvalue.jdbc.JdbcTimestampBoundStore;
 import com.palantir.atlasdb.timestamp.AbstractDbTimestampBoundStoreTest;
 import com.palantir.timestamp.TimestampBoundStore;
+import org.junit.After;
 
 public class JdbcTimestampBoundStoreTest extends AbstractDbTimestampBoundStoreTest {
     private JdbcKeyValueService kvs;
diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTransactionTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTransactionTest.java
index 81fecaddf83..7ded6fb2f6a 100644
--- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTransactionTest.java
+++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcTransactionTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.jdbc;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.transaction.impl.AbstractTransactionTest;
+import org.junit.ClassRule;
 
 public class JdbcTransactionTest extends AbstractTransactionTest {
     @ClassRule
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/jdbc/config/JdbcDataSourceConfiguration.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/jdbc/config/JdbcDataSourceConfiguration.java
index 0041b46af22..2c59d1e1080 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/jdbc/config/JdbcDataSourceConfiguration.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/jdbc/config/JdbcDataSourceConfiguration.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.jdbc.config;
 
-import javax.sql.DataSource;
-
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import javax.sql.DataSource;
 
 @JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, property = "type")
 public interface JdbcDataSourceConfiguration {
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java
index dd38528f3be..acf5bac855e 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.jdbc;
 
-import java.util.Optional;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.auto.service.AutoService;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -35,6 +28,11 @@
 import com.palantir.atlasdb.versions.AtlasDbVersion;
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.PersistentTimestampServiceImpl;
+import java.util.Optional;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @AutoService(AtlasDbFactory.class)
 public class JdbcAtlasDbFactory implements AtlasDbFactory {
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueConfiguration.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueConfiguration.java
index ed5c62fc385..f1114f7fa5a 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueConfiguration.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueConfiguration.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.jdbc;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -29,6 +25,8 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @AutoService(KeyValueServiceConfig.class)
 @JsonDeserialize(as = ImmutableJdbcKeyValueConfiguration.class)
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java
index d7156cae38a..5c8e970ab85 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.jdbc;
 
-import static org.jooq.Clause.TABLE_VALUES;
-import static org.jooq.impl.DSL.field;
-import static org.jooq.impl.DSL.row;
-import static org.jooq.impl.DSL.table;
-import static org.jooq.impl.SQLDataType.BIGINT;
-import static org.jooq.impl.SQLDataType.BLOB;
-import static org.jooq.impl.SQLDataType.VARBINARY;
-import static org.jooq.impl.SQLDataType.VARCHAR;
-
 import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.ATLAS_TABLE;
 import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.A_COL_NAME;
 import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.A_ROW_NAME;
@@ -48,46 +39,14 @@
 import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.TEMP_TABLE_2;
 import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.TIMESTAMP;
 import static com.palantir.atlasdb.keyvalue.jdbc.impl.JdbcConstants.VALUE;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.Set;
-import java.util.SortedMap;
-
-import javax.sql.DataSource;
-
-import org.jooq.BatchBindStep;
-import org.jooq.Condition;
-import org.jooq.DSLContext;
-import org.jooq.InsertValuesStep4;
-import org.jooq.Query;
-import org.jooq.Record;
-import org.jooq.Record1;
-import org.jooq.RenderContext;
-import org.jooq.Result;
-import org.jooq.Row;
-import org.jooq.Row3;
-import org.jooq.RowN;
-import org.jooq.SQLDialect;
-import org.jooq.Select;
-import org.jooq.SelectField;
-import org.jooq.SelectOffsetStep;
-import org.jooq.Table;
-import org.jooq.TableLike;
-import org.jooq.conf.RenderNameStyle;
-import org.jooq.conf.Settings;
-import org.jooq.exception.DataAccessException;
-import org.jooq.impl.DSL;
+import static org.jooq.Clause.TABLE_VALUES;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.row;
+import static org.jooq.impl.DSL.table;
+import static org.jooq.impl.SQLDataType.BIGINT;
+import static org.jooq.impl.SQLDataType.BLOB;
+import static org.jooq.impl.SQLDataType.VARBINARY;
+import static org.jooq.impl.SQLDataType.VARCHAR;
 
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
@@ -142,6 +101,43 @@
 import com.palantir.util.paging.AbstractPagingIterable;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.io.Closeable;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.SortedMap;
+import javax.sql.DataSource;
+import org.jooq.BatchBindStep;
+import org.jooq.Condition;
+import org.jooq.DSLContext;
+import org.jooq.InsertValuesStep4;
+import org.jooq.Query;
+import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.RenderContext;
+import org.jooq.Result;
+import org.jooq.Row;
+import org.jooq.Row3;
+import org.jooq.RowN;
+import org.jooq.SQLDialect;
+import org.jooq.Select;
+import org.jooq.SelectField;
+import org.jooq.SelectOffsetStep;
+import org.jooq.Table;
+import org.jooq.TableLike;
+import org.jooq.conf.RenderNameStyle;
+import org.jooq.conf.Settings;
+import org.jooq.exception.DataAccessException;
+import org.jooq.impl.DSL;
 
 public class JdbcKeyValueService implements KeyValueService {
     private final int rowBatchSize;
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcTimestampBoundStore.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcTimestampBoundStore.java
index 670bd443eea..b40a930b7e7 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcTimestampBoundStore.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcTimestampBoundStore.java
@@ -18,6 +18,10 @@
 import static org.jooq.impl.SQLDataType.BIGINT;
 import static org.jooq.impl.SQLDataType.INTEGER;
 
+import com.google.common.base.Function;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.timestamp.MultipleRunningTimestampServiceError;
+import com.palantir.timestamp.TimestampBoundStore;
 import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.Record;
@@ -26,11 +30,6 @@
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.DSL;
 
-import com.google.common.base.Function;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.timestamp.MultipleRunningTimestampServiceError;
-import com.palantir.timestamp.TimestampBoundStore;
-
 public class JdbcTimestampBoundStore implements TimestampBoundStore {
     private final JdbcKeyValueService kvs;
     private long latestTimestamp;
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/MultiTimestampPutBatch.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/MultiTimestampPutBatch.java
index c38edd23821..07faa320cfb 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/MultiTimestampPutBatch.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/MultiTimestampPutBatch.java
@@ -15,27 +15,24 @@
  */
 package com.palantir.atlasdb.keyvalue.jdbc.impl;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.Value;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.annotation.Nullable;
-
 import org.jooq.InsertValuesStep4;
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.Row3;
 import org.jooq.impl.DSL;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.Value;
-
 public class MultiTimestampPutBatch implements PutBatch {
     private final Multimap<Cell, Value> data;
 
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/PutBatch.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/PutBatch.java
index 295bbec295c..8a07f27707e 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/PutBatch.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/PutBatch.java
@@ -16,9 +16,7 @@
 package com.palantir.atlasdb.keyvalue.jdbc.impl;
 
 import java.util.Collection;
-
 import javax.annotation.Nullable;
-
 import org.jooq.InsertValuesStep4;
 import org.jooq.Record;
 import org.jooq.Result;
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/SingleTimestampPutBatch.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/SingleTimestampPutBatch.java
index 0ff1e6fbca1..1eb13df96de 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/SingleTimestampPutBatch.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/impl/SingleTimestampPutBatch.java
@@ -15,25 +15,22 @@
  */
 package com.palantir.atlasdb.keyvalue.jdbc.impl;
 
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Maps;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.common.collect.Maps2;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.annotation.Nullable;
-
 import org.jooq.InsertValuesStep4;
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.Row3;
 import org.jooq.impl.DSL;
 
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Maps;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.common.collect.Maps2;
-
 public class SingleTimestampPutBatch implements PutBatch {
     private final Map<Cell, byte[]> data;
     private final Long timestamp;
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/AsyncLockClient.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/AsyncLockClient.java
index 31b6b5752d1..b04a2f8f1f4 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/AsyncLockClient.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/AsyncLockClient.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.util.List;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.lock.StringLockDescriptor;
@@ -28,6 +25,8 @@
 import com.palantir.lock.v2.NamespacedTimelockRpcClient;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import java.util.Set;
 
 public final class AsyncLockClient implements JepsenLockClient<LockToken> {
     private final TimelockService timelockService;
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/JepsenLockClient.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/JepsenLockClient.java
index 222a85b7dbb..0c8fe194871 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/JepsenLockClient.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/JepsenLockClient.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import java.util.Set;
 
 public interface JepsenLockClient<TOKEN> {
     TOKEN lock(String client, String lockName) throws InterruptedException;
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/SynchronousLockClient.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/SynchronousLockClient.java
index 1d974fca481..ed4fbe3af83 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/SynchronousLockClient.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/SynchronousLockClient.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.util.List;
-import java.util.Set;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Sets;
@@ -28,6 +25,8 @@
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.LockService;
 import com.palantir.lock.StringLockDescriptor;
+import java.util.List;
+import java.util.Set;
 
 public class SynchronousLockClient implements JepsenLockClient<LockRefreshToken> {
     private final LockService lockService;
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimelockUtils.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimelockUtils.java
index de01d4f846f..f671d3be5b8 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimelockUtils.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimelockUtils.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.config.AuxiliaryRemotingParameters;
 import com.palantir.atlasdb.config.ImmutableServerListConfig;
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.conjure.java.api.config.service.UserAgent;
+import java.util.List;
 
 public final class TimelockUtils {
     private static final int PORT = 8080;
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimestampClient.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimestampClient.java
index 040acdb1bf6..b5509bcbd55 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimestampClient.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/http/TimestampClient.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.http;
 
-import java.util.List;
-
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.timestamp.TimestampService;
+import java.util.List;
 
 public final class TimestampClient {
     private TimestampClient() {
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/CheckerResult.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/CheckerResult.java
index 39766cfb97f..bcc57190bbe 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/CheckerResult.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/CheckerResult.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.jepsen;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.jepsen.events.Event;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableCheckerResult.class)
 @JsonDeserialize(as = ImmutableCheckerResult.class)
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryChecker.java
index ac3d12e8d48..bc3f7520d8e 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryChecker.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryChecker.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.jepsen;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import clojure.lang.Keyword;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.jepsen.events.Checker;
 import com.palantir.atlasdb.jepsen.events.Event;
-
-import clojure.lang.Keyword;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class JepsenHistoryChecker {
 
@@ -87,5 +85,3 @@ private static List<Map<Keyword, Object>> convertEventListToClojureHistory(List<
     }
 
 }
-
-
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckers.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckers.java
index 72f39121c76..0c17954a75d 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckers.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckers.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.jepsen;
 
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.events.Checker;
@@ -28,6 +24,9 @@
 import com.palantir.atlasdb.jepsen.timestamp.MonotonicChecker;
 import com.palantir.atlasdb.jepsen.timestamp.NonOverlappingReadsMonotonicChecker;
 import com.palantir.atlasdb.jepsen.timestamp.UniquenessChecker;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 
 public final class JepsenHistoryCheckers {
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/NemesisResilienceChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/NemesisResilienceChecker.java
index 06375784f9e..3ca92af842c 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/NemesisResilienceChecker.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/NemesisResilienceChecker.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.jepsen;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -28,6 +24,9 @@
 import com.palantir.atlasdb.jepsen.events.InfoEvent;
 import com.palantir.atlasdb.jepsen.events.InvokeEvent;
 import com.palantir.atlasdb.jepsen.events.OkEvent;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 public class NemesisResilienceChecker implements Checker {
     @Override
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelper.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelper.java
index 6cdd5c75ac5..56cd562b0f4 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelper.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelper.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.atlasdb.jepsen;
 
+import com.palantir.atlasdb.jepsen.events.Checker;
+import com.palantir.atlasdb.jepsen.events.Event;
+import com.palantir.atlasdb.jepsen.events.InfoEvent;
+import com.palantir.atlasdb.jepsen.events.InvokeEvent;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -23,11 +27,6 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import com.palantir.atlasdb.jepsen.events.Checker;
-import com.palantir.atlasdb.jepsen.events.Event;
-import com.palantir.atlasdb.jepsen.events.InfoEvent;
-import com.palantir.atlasdb.jepsen.events.InvokeEvent;
-
 public class PartitionByInvokeNameCheckerHelper implements Checker {
     private final Supplier<Checker> checkerSupplier;
 
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Checker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Checker.java
index d6c6e988799..5a76fa5285c 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Checker.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Checker.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.jepsen.events;
 
-import java.util.List;
-
 import com.palantir.atlasdb.jepsen.CheckerResult;
+import java.util.List;
 
 public interface Checker  {
     CheckerResult check(List<Event> events);
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Event.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Event.java
index 388f109cae7..68bd872774e 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Event.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/Event.java
@@ -15,10 +15,7 @@
  */
 package com.palantir.atlasdb.jepsen.events;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
+import clojure.lang.Keyword;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -26,8 +23,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.palantir.atlasdb.jepsen.utils.EventUtils;
-
-import clojure.lang.Keyword;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 import one.util.streamex.EntryStream;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/FailEvent.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/FailEvent.java
index bac63b276fd..29faf58d919 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/FailEvent.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/FailEvent.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.jepsen.events;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableFailEvent.class)
 @JsonDeserialize(as = ImmutableFailEvent.class)
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InfoEvent.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InfoEvent.java
index abef5efbec1..62c95997c68 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InfoEvent.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InfoEvent.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.jepsen.events;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableInfoEvent.class)
 @JsonDeserialize(as = ImmutableInfoEvent.class)
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InvokeEvent.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InvokeEvent.java
index 966a7718b86..51f1e17bf4a 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InvokeEvent.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/InvokeEvent.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.jepsen.events;
 
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableInvokeEvent.class)
 @JsonDeserialize(as = ImmutableInvokeEvent.class)
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/OkEvent.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/OkEvent.java
index fc40cd56c4e..57a4b374995 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/OkEvent.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/events/OkEvent.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.atlasdb.jepsen.events;
 
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableOkEvent.class)
 @JsonDeserialize(as = ImmutableOkEvent.class)
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessChecker.java
index 8018a976d50..e68eed1e465 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessChecker.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessChecker.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.jepsen.lock;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.ImmutableCheckerResult;
@@ -33,6 +26,12 @@
 import com.palantir.atlasdb.jepsen.events.RequestType;
 import com.palantir.atlasdb.jepsen.utils.EventUtils;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * This checker verifies that the sequence of events is correct for each process in isolation. Since we know that no
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessChecker.java
index 95b5a15436c..5d51e747d64 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessChecker.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessChecker.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.jepsen.lock;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
 import com.google.common.collect.TreeRangeSet;
@@ -37,6 +29,12 @@
 import com.palantir.atlasdb.jepsen.utils.EventUtils;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.util.Pair;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Checker verifying that whenever a lock is granted, there was a time point between the request and the
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessChecker.java
index ce0f2055abc..0ff75bb9a7f 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessChecker.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessChecker.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.jepsen.lock;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
 import com.google.common.collect.TreeRangeSet;
@@ -36,6 +28,12 @@
 import com.palantir.atlasdb.jepsen.events.RequestType;
 import com.palantir.atlasdb.jepsen.utils.EventUtils;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This checker verifies that refreshes of locks do not cause two processes to simultaneously hold the same lock.
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicChecker.java
index 697489b7ed3..e83c80a8948 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicChecker.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicChecker.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.jepsen.timestamp;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.ImmutableCheckerResult;
@@ -27,6 +22,10 @@
 import com.palantir.atlasdb.jepsen.events.Event;
 import com.palantir.atlasdb.jepsen.events.EventVisitor;
 import com.palantir.atlasdb.jepsen.events.OkEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class MonotonicChecker implements Checker {
     @Override
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicChecker.java
index 5eae4751ba7..b38325b159b 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicChecker.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicChecker.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.jepsen.timestamp;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableSet;
-import java.util.TreeSet;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.ImmutableCheckerResult;
@@ -34,6 +26,13 @@
 import com.palantir.atlasdb.jepsen.events.InvokeEvent;
 import com.palantir.atlasdb.jepsen.events.OkEvent;
 import com.palantir.atlasdb.jepsen.events.RequestType;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.TreeSet;
 
 public class NonOverlappingReadsMonotonicChecker implements Checker {
     @Override
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessChecker.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessChecker.java
index 0f3a4b9b0a5..0ad114cf181 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessChecker.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessChecker.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.jepsen.timestamp;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.ImmutableCheckerResult;
@@ -28,6 +23,10 @@
 import com.palantir.atlasdb.jepsen.events.EventVisitor;
 import com.palantir.atlasdb.jepsen.events.FailEvent;
 import com.palantir.atlasdb.jepsen.events.OkEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class UniquenessChecker implements Checker {
     @Override
diff --git a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/utils/EventUtils.java b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/utils/EventUtils.java
index a409ba095cd..de72ed2a54a 100644
--- a/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/utils/EventUtils.java
+++ b/atlasdb-jepsen-tests/src/main/java/com/palantir/atlasdb/jepsen/utils/EventUtils.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.jepsen.utils;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import clojure.lang.Keyword;
 import com.palantir.atlasdb.jepsen.JepsenConstants;
 import com.palantir.atlasdb.jepsen.events.OkEvent;
 import com.palantir.atlasdb.jepsen.events.RequestType;
-
-import clojure.lang.Keyword;
+import java.util.HashMap;
+import java.util.Map;
 
 public final class EventUtils {
     private EventUtils() {
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/JepsenLockClientTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/JepsenLockClientTest.java
index 4784cbfc2e9..f607abe9487 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/JepsenLockClientTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/JepsenLockClientTest.java
@@ -27,13 +27,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
 import java.util.Set;
-
 import org.junit.Test;
 import org.mockito.stubbing.Answer;
 
-import com.google.common.collect.ImmutableSet;
-
 public class JepsenLockClientTest {
     private static final String LOCK_TOKEN = "foo";
 
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/SynchronousLockClientTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/SynchronousLockClientTest.java
index 42b4e0dff31..5a155ad7b47 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/SynchronousLockClientTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/SynchronousLockClientTest.java
@@ -29,17 +29,15 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.math.BigInteger;
-import java.util.Collections;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.lock.BlockingMode;
 import com.palantir.lock.LockMode;
 import com.palantir.lock.LockRefreshToken;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.LockService;
+import java.math.BigInteger;
+import java.util.Collections;
+import org.junit.Test;
 
 public class SynchronousLockClientTest {
     private static final LockService LOCK_SERVICE = mock(LockService.class);
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerIntegrationTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerIntegrationTest.java
index 163740b472c..b930ea8cdbb 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerIntegrationTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerIntegrationTest.java
@@ -17,24 +17,21 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.junit.Test;
-
+import clojure.lang.Keyword;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
 import com.palantir.atlasdb.jepsen.events.Checker;
-
-import clojure.lang.Keyword;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import one.util.streamex.EntryStream;
+import org.junit.Test;
 
 public class JepsenHistoryCheckerIntegrationTest {
     @Test
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerTest.java
index 0077580e6ca..a18da6db8c7 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckerTest.java
@@ -21,18 +21,15 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.junit.Test;
-
+import clojure.lang.Keyword;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.jepsen.events.Checker;
 import com.palantir.atlasdb.jepsen.events.Event;
-
-import clojure.lang.Keyword;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.junit.Test;
 
 public class JepsenHistoryCheckerTest {
     private static final Map<Keyword, ?> INFO_EVENT = ImmutableMap.of(
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckersTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckersTest.java
index 51f00996639..b9685ec3f20 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckersTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/JepsenHistoryCheckersTest.java
@@ -18,14 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.jepsen.events.Checker;
 import java.util.List;
 import java.util.function.Supplier;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.jepsen.events.Checker;
-
 public class JepsenHistoryCheckersTest {
     @Test
     public void canCreateWithTimestampCheckers() {
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/NemesisResilienceCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/NemesisResilienceCheckerTest.java
index 4b213dc7488..638b9b83ff3 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/NemesisResilienceCheckerTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/NemesisResilienceCheckerTest.java
@@ -17,12 +17,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.events.Event;
 import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils;
 import com.palantir.atlasdb.jepsen.utils.TestEventUtils;
+import org.junit.Test;
 
 public class NemesisResilienceCheckerTest {
     private static final long ZERO_TIME = 0L;
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelperTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelperTest.java
index d6d83d76c32..e5a40dd381d 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelperTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelperTest.java
@@ -17,14 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Supplier;
-
-import org.junit.Test;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.events.Checker;
 import com.palantir.atlasdb.jepsen.events.Event;
@@ -34,6 +26,12 @@
 import com.palantir.atlasdb.jepsen.events.RequestType;
 import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils;
 import com.palantir.atlasdb.jepsen.utils.TestEventUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
 
 public class PartitionByInvokeNameCheckerHelperTest {
 
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/events/EventTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/events/EventTest.java
index e29fef6747d..75390918317 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/events/EventTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/events/EventTest.java
@@ -17,16 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import clojure.lang.Keyword;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.jepsen.JepsenConstants;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.jepsen.JepsenConstants;
-
-import clojure.lang.Keyword;
-
 public class EventTest {
     public static final String SOME_LONG_AS_STRING = "136";
     public static final String SOME_STRING = "SOME_STRING";
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessCheckerTest.java
index 1134f3395c5..2667997dcaf 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessCheckerTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/IsolatedProcessCorrectnessCheckerTest.java
@@ -17,10 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.PartitionByInvokeNameCheckerHelper;
@@ -28,6 +24,8 @@
 import com.palantir.atlasdb.jepsen.events.Event;
 import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils;
 import com.palantir.atlasdb.jepsen.utils.TestEventUtils;
+import java.util.List;
+import org.junit.Test;
 
 public class IsolatedProcessCorrectnessCheckerTest {
     private static final int PROCESS_1 = 1;
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessCheckerTest.java
index b6e4120e991..fcb8f8412fc 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessCheckerTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/LockCorrectnessCheckerTest.java
@@ -17,10 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.PartitionByInvokeNameCheckerHelper;
@@ -28,6 +24,8 @@
 import com.palantir.atlasdb.jepsen.events.Event;
 import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils;
 import com.palantir.atlasdb.jepsen.utils.TestEventUtils;
+import java.util.List;
+import org.junit.Test;
 
 public class LockCorrectnessCheckerTest {
     private static final int PROCESS_1 = 1;
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessCheckerTest.java
index 3c1536c30bf..35682aa2064 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessCheckerTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/lock/RefreshCorrectnessCheckerTest.java
@@ -17,10 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.PartitionByInvokeNameCheckerHelper;
@@ -28,6 +24,8 @@
 import com.palantir.atlasdb.jepsen.events.Event;
 import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils;
 import com.palantir.atlasdb.jepsen.utils.TestEventUtils;
+import java.util.List;
+import org.junit.Test;
 
 public class RefreshCorrectnessCheckerTest {
     private static final int PROCESS_1 = 1;
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicCheckerTest.java
index c693029f3dd..08880bc3107 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicCheckerTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/MonotonicCheckerTest.java
@@ -18,13 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.events.Event;
 import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils;
 import com.palantir.atlasdb.jepsen.utils.TestEventUtils;
+import org.junit.Test;
 
 public class MonotonicCheckerTest {
     private static final Long ZERO_TIME = 0L;
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicCheckerTest.java
index 857f3c022ce..2bc77e4b5c7 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicCheckerTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/NonOverlappingReadsMonotonicCheckerTest.java
@@ -18,13 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.events.Event;
 import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils;
 import com.palantir.atlasdb.jepsen.utils.TestEventUtils;
+import org.junit.Test;
 
 public class NonOverlappingReadsMonotonicCheckerTest {
     private static final int PROCESS_0 = 0;
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessCheckerTest.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessCheckerTest.java
index 50b18c91db0..7fa0bebb79f 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessCheckerTest.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/timestamp/UniquenessCheckerTest.java
@@ -17,13 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.events.Event;
 import com.palantir.atlasdb.jepsen.utils.CheckerTestUtils;
 import com.palantir.atlasdb.jepsen.utils.TestEventUtils;
+import org.junit.Test;
 
 public class UniquenessCheckerTest {
     private static final long ZERO_TIME = 0L;
diff --git a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/utils/CheckerTestUtils.java b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/utils/CheckerTestUtils.java
index af0e3f83fbb..66e7646cccd 100644
--- a/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/utils/CheckerTestUtils.java
+++ b/atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/utils/CheckerTestUtils.java
@@ -17,13 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-import java.util.function.Supplier;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.jepsen.CheckerResult;
 import com.palantir.atlasdb.jepsen.events.Checker;
 import com.palantir.atlasdb.jepsen.events.Event;
+import java.util.List;
+import java.util.function.Supplier;
 
 public final class CheckerTestUtils {
     private CheckerTestUtils() {
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/MinimalReportFormatForTest.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/MinimalReportFormatForTest.java
index d44cd14e121..8b77de6cbb2 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/MinimalReportFormatForTest.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/MinimalReportFormatForTest.java
@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Collection;
-
 import org.openjdk.jmh.infra.BenchmarkParams;
 import org.openjdk.jmh.infra.IterationParams;
 import org.openjdk.jmh.results.BenchmarkResult;
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java
index c9ba9675de9..eabe60011f5 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java
@@ -15,6 +15,12 @@
  */
 package com.palantir.atlasdb.performance;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Lists;
+import com.palantir.atlasdb.performance.backend.DockerizedDatabaseUri;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -28,7 +34,6 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.immutables.value.Value;
 import org.openjdk.jmh.infra.BenchmarkParams;
 import org.openjdk.jmh.results.RunResult;
@@ -36,13 +41,6 @@
 import org.openjdk.jmh.util.Statistics;
 import org.openjdk.jmh.util.TreeMultiset;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
-import com.palantir.atlasdb.performance.backend.DockerizedDatabaseUri;
-
 public class PerformanceResults {
     @VisibleForTesting
     static final String KVS_AGNOSTIC_SUFFIX = "N/A";
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/AtlasDbServicesConnector.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/AtlasDbServicesConnector.java
index dac9d59f9e9..b7f09c7b8a2 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/AtlasDbServicesConnector.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/AtlasDbServicesConnector.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.performance.backend;
 
-import java.io.Closeable;
-
-import org.openjdk.jmh.annotations.Param;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-
 import com.palantir.atlasdb.config.ImmutableAtlasDbConfig;
 import com.palantir.atlasdb.config.ImmutableAtlasDbRuntimeConfig;
 import com.palantir.atlasdb.services.AtlasDbServices;
@@ -28,6 +22,10 @@
 import com.palantir.atlasdb.services.ServicesConfigModule;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.io.Closeable;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
 
 @State(Scope.Benchmark)
 public class AtlasDbServicesConnector implements Closeable {
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraKeyValueServiceInstrumentation.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraKeyValueServiceInstrumentation.java
index 7ae4a0a4579..748cb3cde2e 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraKeyValueServiceInstrumentation.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraKeyValueServiceInstrumentation.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.performance.backend;
 
-import java.net.InetSocketAddress;
-
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.ImmutableDefaultConfig;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueServiceImpl;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+import java.net.InetSocketAddress;
 
 public class CassandraKeyValueServiceInstrumentation extends KeyValueServiceInstrumentation {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DatabasesContainer.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DatabasesContainer.java
index 26d18108b99..834a4e47405 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DatabasesContainer.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DatabasesContainer.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.atlasdb.performance.backend;
 
+import com.google.common.collect.Lists;
 import java.util.List;
-
 import org.awaitility.Awaitility;
 import org.awaitility.Duration;
 
-import com.google.common.collect.Lists;
-
 public final class DatabasesContainer implements AutoCloseable {
 
     public static DatabasesContainer startup(List<KeyValueServiceInstrumentation> backends) {
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DockerizedDatabase.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DockerizedDatabase.java
index ace99276831..8b5fba603d7 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DockerizedDatabase.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/DockerizedDatabase.java
@@ -15,24 +15,22 @@
  */
 package com.palantir.atlasdb.performance.backend;
 
+import com.palantir.docker.compose.DockerComposeRule;
+import com.palantir.docker.compose.configuration.ShutdownStrategy;
+import com.palantir.docker.compose.connection.DockerPort;
+import com.palantir.docker.compose.connection.waiting.HealthCheck;
+import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import com.palantir.logsafe.exceptions.SafeRuntimeException;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.URL;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 
-import com.palantir.docker.compose.DockerComposeRule;
-import com.palantir.docker.compose.configuration.ShutdownStrategy;
-import com.palantir.docker.compose.connection.DockerPort;
-import com.palantir.docker.compose.connection.waiting.HealthCheck;
-import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-import com.palantir.logsafe.exceptions.SafeRuntimeException;
-
 public final class DockerizedDatabase implements Closeable {
 
     private static final String DOCKER_LOGS_DIR = "container-logs";
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceInstrumentation.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceInstrumentation.java
index 3a26b0139c9..939c359d373 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceInstrumentation.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceInstrumentation.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.performance.backend;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import java.lang.reflect.Constructor;
 import java.net.InetSocketAddress;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.palantir.atlasdb.spi.KeyValueServiceConfig;
-
 public abstract class KeyValueServiceInstrumentation {
 
     private final int kvsPort;
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresKeyValueServiceInstrumentation.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresKeyValueServiceInstrumentation.java
index a134a516267..710f4e29726 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresKeyValueServiceInstrumentation.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresKeyValueServiceInstrumentation.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.performance.backend;
 
-import java.net.InetSocketAddress;
-
 import com.palantir.atlasdb.keyvalue.dbkvs.ImmutableDbKeyValueServiceConfig;
 import com.palantir.atlasdb.keyvalue.dbkvs.ImmutablePostgresDdlConfig;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import com.palantir.nexus.db.pool.config.ImmutableMaskedValue;
 import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig;
+import java.net.InetSocketAddress;
 
 public class PostgresKeyValueServiceInstrumentation extends KeyValueServiceInstrumentation {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/HttpBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/HttpBenchmarks.java
index dbff033dfb2..854a97b0ff9 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/HttpBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/HttpBenchmarks.java
@@ -15,12 +15,14 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.net.HttpHeaders;
+import com.palantir.common.remoting.HeaderAccessUtils;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import javax.ws.rs.core.MediaType;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -29,11 +31,6 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.net.HttpHeaders;
-import com.palantir.common.remoting.HeaderAccessUtils;
-
 @State(Scope.Thread)
 public class HttpBenchmarks {
     private static final String LOWERCASE_CONTENT_TYPE = HttpHeaders.CONTENT_TYPE.toLowerCase();
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsDeleteBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsDeleteBenchmarks.java
index 668af9bc718..3a50530f85b 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsDeleteBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsDeleteBenchmarks.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
-import java.util.concurrent.TimeUnit;
-
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Threads;
-import org.openjdk.jmh.annotations.Warmup;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Multimap;
@@ -32,6 +23,13 @@
 import com.palantir.atlasdb.keyvalue.api.TimestampRangeDelete;
 import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable;
 import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
 
 @State(Scope.Benchmark)
 public class KvsDeleteBenchmarks {
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetCandidateCellsForSweepingBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetCandidateCellsForSweepingBenchmarks.java
index 38e82d990bf..9b76ac24f17 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetCandidateCellsForSweepingBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetCandidateCellsForSweepingBenchmarks.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Threads;
-import org.openjdk.jmh.annotations.Warmup;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterators;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -36,6 +26,14 @@
 import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable;
 import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable;
 import com.palantir.common.base.ClosableIterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
 
 @State(Scope.Benchmark)
 public class KvsGetCandidateCellsForSweepingBenchmarks {
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java
index 8784f693469..c39c205809d 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java
@@ -15,12 +15,19 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
+import com.google.common.primitives.Ints;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable;
+import com.palantir.atlasdb.performance.benchmarks.table.Tables;
 import java.io.UnsupportedEncodingException;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -28,15 +35,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-import com.google.common.primitives.Ints;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
-import com.palantir.atlasdb.keyvalue.api.Value;
-import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable;
-import com.palantir.atlasdb.performance.benchmarks.table.Tables;
-
 /**
  * Performance benchmarks for KVS get with dynamic columns.
  *
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java
index bb0b405147c..ab870b35972 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Threads;
-import org.openjdk.jmh.annotations.Warmup;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -37,6 +25,16 @@
 import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
 
 @State(Scope.Benchmark)
 public class KvsGetRangeBenchmarks {
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsBenchmarks.java
index f0e1dcb5b3b..80a668eda99 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsBenchmarks.java
@@ -15,8 +15,12 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.google.common.base.Preconditions;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable;
 import java.util.Map;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -24,12 +28,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import com.google.common.base.Preconditions;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
-import com.palantir.atlasdb.keyvalue.api.Value;
-import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable;
-
 @State(Scope.Benchmark)
 public class KvsGetRowsBenchmarks {
     @Benchmark
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsColumnRangeBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsColumnRangeBenchmarks.java
index 60f8ab5fe80..ea87188c4a2 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsColumnRangeBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRowsColumnRangeBenchmarks.java
@@ -15,6 +15,14 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.google.common.base.Preconditions;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.atlasdb.performance.benchmarks.table.Tables;
+import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable;
+import com.palantir.atlasdb.performance.benchmarks.table.WideRowsTable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -22,7 +30,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -31,15 +38,6 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 
-import com.google.common.base.Preconditions;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
-import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
-import com.palantir.atlasdb.keyvalue.api.Value;
-import com.palantir.atlasdb.performance.benchmarks.table.Tables;
-import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable;
-import com.palantir.atlasdb.performance.benchmarks.table.WideRowsTable;
-
 @State(Scope.Benchmark)
 public class KvsGetRowsColumnRangeBenchmarks {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java
index b3352efbd44..f523d73c9f0 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java
@@ -15,9 +15,14 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.google.common.collect.Maps;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.performance.benchmarks.table.EmptyTables;
+import com.palantir.logsafe.Preconditions;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -25,13 +30,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import com.google.common.collect.Maps;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.performance.benchmarks.table.EmptyTables;
-import com.palantir.logsafe.Preconditions;
-
 /**
  * Performance benchmarks for KVS put operations.
  *
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/StreamStoreBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/StreamStoreBenchmarks.java
index 5131f4c3b9d..bbf350110fc 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/StreamStoreBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/StreamStoreBenchmarks.java
@@ -20,13 +20,16 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertThat;
 
+import com.palantir.atlasdb.performance.benchmarks.table.StreamingTable;
+import com.palantir.atlasdb.performance.schema.generated.StreamTestTableFactory;
+import com.palantir.atlasdb.performance.schema.generated.ValueStreamStore;
+import com.palantir.atlasdb.transaction.api.TransactionManager;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -34,11 +37,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import com.palantir.atlasdb.performance.benchmarks.table.StreamingTable;
-import com.palantir.atlasdb.performance.schema.generated.StreamTestTableFactory;
-import com.palantir.atlasdb.performance.schema.generated.ValueStreamStore;
-import com.palantir.atlasdb.transaction.api.TransactionManager;
-
 @State(Scope.Benchmark)
 public class StreamStoreBenchmarks {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/SweepBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/SweepBenchmarks.java
index eaa721fec8a..727f7520583 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/SweepBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/SweepBenchmarks.java
@@ -18,8 +18,13 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.api.SweepResults;
+import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable;
+import com.palantir.atlasdb.sweep.ImmutableSweepBatchConfig;
+import com.palantir.atlasdb.sweep.SweepBatchConfig;
+import com.palantir.atlasdb.sweep.SweepTaskRunner;
 import java.util.concurrent.TimeUnit;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -27,13 +32,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.api.SweepResults;
-import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable;
-import com.palantir.atlasdb.sweep.ImmutableSweepBatchConfig;
-import com.palantir.atlasdb.sweep.SweepBatchConfig;
-import com.palantir.atlasdb.sweep.SweepTaskRunner;
-
 @State(Scope.Benchmark)
 public class SweepBenchmarks {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TimestampServiceBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TimestampServiceBenchmarks.java
index 11c52d444a0..79d2eecb959 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TimestampServiceBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TimestampServiceBenchmarks.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.palantir.atlasdb.performance.benchmarks.endpoint.TimestampServiceEndpoint;
+import com.palantir.timestamp.TimestampRange;
 import java.util.concurrent.TimeUnit;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 
-import com.palantir.atlasdb.performance.benchmarks.endpoint.TimestampServiceEndpoint;
-import com.palantir.timestamp.TimestampRange;
-
 public class TimestampServiceBenchmarks {
     @Benchmark
     @Warmup(time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionDeleteBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionDeleteBenchmarks.java
index b3fbc37a7bb..56d75226b64 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionDeleteBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionDeleteBenchmarks.java
@@ -15,9 +15,10 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -25,9 +26,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.performance.benchmarks.table.RegeneratingTable;
-
 @State(Scope.Benchmark)
 public class TransactionDeleteBenchmarks {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetBenchmarks.java
index 624e7bc7b5a..78f564798df 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetBenchmarks.java
@@ -15,11 +15,19 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
+import com.google.common.primitives.Ints;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable;
+import com.palantir.common.base.BatchingVisitable;
+import com.palantir.common.base.BatchingVisitables;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -27,16 +35,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-import com.google.common.primitives.Ints;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.RangeRequest;
-import com.palantir.atlasdb.keyvalue.api.RowResult;
-import com.palantir.atlasdb.performance.benchmarks.table.ConsecutiveNarrowTable;
-import com.palantir.common.base.BatchingVisitable;
-import com.palantir.common.base.BatchingVisitables;
-
 @State(Scope.Benchmark)
 public class TransactionGetBenchmarks {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetDynamicBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetDynamicBenchmarks.java
index b7f167673d0..51cd2afac9a 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetDynamicBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetDynamicBenchmarks.java
@@ -15,12 +15,19 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
+import com.google.common.primitives.Ints;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable;
+import com.palantir.atlasdb.performance.benchmarks.table.Tables;
 import java.util.Collections;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -28,15 +35,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-import com.google.common.primitives.Ints;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
-import com.palantir.atlasdb.keyvalue.api.RowResult;
-import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable;
-import com.palantir.atlasdb.performance.benchmarks.table.Tables;
-
 /**
  * Performance benchmarks for KVS get with dynamic columns.
  *
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetRowsColumnRangeBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetRowsColumnRangeBenchmarks.java
index 471900c7e5f..c71433e3dc6 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetRowsColumnRangeBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionGetRowsColumnRangeBenchmarks.java
@@ -15,12 +15,20 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.google.common.base.Preconditions;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.performance.benchmarks.table.CleanModeratelyWideRowTable;
+import com.palantir.atlasdb.performance.benchmarks.table.DirtyModeratelyWideRowTable;
+import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable;
+import com.palantir.atlasdb.performance.benchmarks.table.Tables;
+import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable;
+import com.palantir.atlasdb.performance.benchmarks.table.WideRowTable;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -29,16 +37,6 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 
-import com.google.common.base.Preconditions;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
-import com.palantir.atlasdb.performance.benchmarks.table.CleanModeratelyWideRowTable;
-import com.palantir.atlasdb.performance.benchmarks.table.DirtyModeratelyWideRowTable;
-import com.palantir.atlasdb.performance.benchmarks.table.ModeratelyWideRowTable;
-import com.palantir.atlasdb.performance.benchmarks.table.Tables;
-import com.palantir.atlasdb.performance.benchmarks.table.VeryWideRowTable;
-import com.palantir.atlasdb.performance.benchmarks.table.WideRowTable;
-
 @State(Scope.Benchmark)
 public class TransactionGetRowsColumnRangeBenchmarks {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionPutBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionPutBenchmarks.java
index f0342b1922a..5f9fc470b6a 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionPutBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/TransactionPutBenchmarks.java
@@ -15,9 +15,10 @@
  */
 package com.palantir.atlasdb.performance.benchmarks;
 
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.performance.benchmarks.table.EmptyTables;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -25,9 +26,6 @@
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.performance.benchmarks.table.EmptyTables;
-
 /**
  * Performance benchmarks for KVS put operations.
  *
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/endpoint/TimestampServiceEndpoint.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/endpoint/TimestampServiceEndpoint.java
index 8bc897fc173..0b14b4f7a96 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/endpoint/TimestampServiceEndpoint.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/endpoint/TimestampServiceEndpoint.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.endpoint;
 
+import com.palantir.atlasdb.performance.backend.AtlasDbServicesConnector;
+import com.palantir.timestamp.TimestampRange;
+import com.palantir.timestamp.TimestampService;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 
-import com.palantir.atlasdb.performance.backend.AtlasDbServicesConnector;
-import com.palantir.timestamp.TimestampRange;
-import com.palantir.timestamp.TimestampService;
-
 @State(Scope.Benchmark)
 public class TimestampServiceEndpoint {
 
@@ -50,4 +49,3 @@ public void cleanup() throws Exception {
         this.connector.close();
     }
 }
-
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/AbstractWideRowsTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/AbstractWideRowsTable.java
index ca2f3494cc7..5f503be9472 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/AbstractWideRowsTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/AbstractWideRowsTable.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.openjdk.jmh.annotations.Level;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.primitives.Ints;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -34,6 +24,14 @@
 import com.palantir.atlasdb.performance.benchmarks.Benchmarks;
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
 
 @State(Scope.Benchmark)
 public abstract class AbstractWideRowsTable {
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/CleanModeratelyWideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/CleanModeratelyWideRowTable.java
index df933d6a7c2..26c058078af 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/CleanModeratelyWideRowTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/CleanModeratelyWideRowTable.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 @State(Scope.Benchmark)
 public class CleanModeratelyWideRowTable extends WideRowTableWithAbortedValues {
     @Override
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ConsecutiveNarrowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ConsecutiveNarrowTable.java
index 4135504773f..2808d4c111b 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ConsecutiveNarrowTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ConsecutiveNarrowTable.java
@@ -15,20 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.openjdk.jmh.annotations.Level;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -43,6 +29,18 @@
 import com.palantir.atlasdb.performance.benchmarks.Benchmarks;
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
 
 /**
  * State class for creating a single Atlas table and adding N rows with row names [0...N).
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/DirtyModeratelyWideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/DirtyModeratelyWideRowTable.java
index 084c904815b..88107b3be5c 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/DirtyModeratelyWideRowTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/DirtyModeratelyWideRowTable.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 @State(Scope.Benchmark)
 public class DirtyModeratelyWideRowTable extends WideRowTableWithAbortedValues {
     @Override
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/EmptyTables.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/EmptyTables.java
index c205a1721c8..9887e2a2ec1 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/EmptyTables.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/EmptyTables.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
-import java.util.Map;
-import java.util.Random;
-
-import org.openjdk.jmh.annotations.Level;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
-
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -32,6 +23,13 @@
 import com.palantir.atlasdb.performance.benchmarks.Benchmarks;
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Map;
+import java.util.Random;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
 
 /**
  * State class for creating a single Atlas table with one wide row.
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ModeratelyWideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ModeratelyWideRowTable.java
index cc510258af9..f36f72399b0 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ModeratelyWideRowTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/ModeratelyWideRowTable.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 @State(Scope.Benchmark)
 public class ModeratelyWideRowTable extends WideRowTable {
     @Override
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/RegeneratingTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/RegeneratingTable.java
index 7bb63643331..712abd72597 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/RegeneratingTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/RegeneratingTable.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.stream.LongStream;
-
-import org.openjdk.jmh.annotations.Level;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -41,6 +30,15 @@
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.sweep.SweepTaskRunner;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.stream.LongStream;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
 
 /**
  * State class for creating a single Atlas table with one wide row.
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/StreamingTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/StreamingTable.java
index 6d4c75e0f00..c9f3dead318 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/StreamingTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/StreamingTable.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Random;
-
-import org.openjdk.jmh.annotations.Level;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
-
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -42,6 +31,15 @@
 import com.palantir.atlasdb.table.generation.ColumnValues;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.persist.Persistable;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Random;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
 
 @State(Scope.Benchmark)
 public class StreamingTable {
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/Tables.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/Tables.java
index e873def4dc1..fddc47209c2 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/Tables.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/Tables.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.Random;
-
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Ints;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Random;
 
 public final class Tables {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/VeryWideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/VeryWideRowTable.java
index 620eeabe345..eda18d9fefa 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/VeryWideRowTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/VeryWideRowTable.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-
 @State(Scope.Benchmark)
 public class VeryWideRowTable extends WideRowTable {
     @Override
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTable.java
index 5f93a8a2529..d3eecb042b8 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTable.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.Set;
-
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.TearDown;
-
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
@@ -33,6 +25,12 @@
 import com.palantir.atlasdb.performance.benchmarks.Benchmarks;
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Set;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
 
 /**
  * State class for creating a single Atlas table with one wide row.
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTableWithAbortedValues.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTableWithAbortedValues.java
index b1b0f1a188a..b5fb17d90bc 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTableWithAbortedValues.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowTableWithAbortedValues.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
@@ -29,6 +22,12 @@
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.ptobject.EncodingUtils;
 import com.palantir.util.crypto.Sha256Hash;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * State class for creating a single Atlas table with one wide row.
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowsTable.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowsTable.java
index 9cd285745e7..2685f829622 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowsTable.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/table/WideRowsTable.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.performance.benchmarks.table;
 
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
-
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -33,6 +24,13 @@
 import com.palantir.atlasdb.performance.benchmarks.Benchmarks;
 import com.palantir.atlasdb.services.AtlasDbServices;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
 
 /**
  * State class for creating a single Atlas table with one wide row.
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java
index 530eddd1d3a..4b7088c05ac 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java
@@ -15,15 +15,26 @@
  */
 package com.palantir.atlasdb.performance.cli;
 
+import com.palantir.atlasdb.performance.BenchmarkParam;
+import com.palantir.atlasdb.performance.MinimalReportFormatForTest;
+import com.palantir.atlasdb.performance.PerformanceResults;
+import com.palantir.atlasdb.performance.backend.DatabasesContainer;
+import com.palantir.atlasdb.performance.backend.DockerizedDatabase;
+import com.palantir.atlasdb.performance.backend.DockerizedDatabaseUri;
+import com.palantir.atlasdb.performance.backend.KeyValueServiceInstrumentation;
+import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import io.airlift.airline.Arguments;
+import io.airlift.airline.Command;
+import io.airlift.airline.HelpOption;
+import io.airlift.airline.Option;
+import io.airlift.airline.SingleCommand;
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import javax.inject.Inject;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.results.RunResult;
@@ -36,21 +47,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.atlasdb.performance.BenchmarkParam;
-import com.palantir.atlasdb.performance.MinimalReportFormatForTest;
-import com.palantir.atlasdb.performance.PerformanceResults;
-import com.palantir.atlasdb.performance.backend.DatabasesContainer;
-import com.palantir.atlasdb.performance.backend.DockerizedDatabase;
-import com.palantir.atlasdb.performance.backend.DockerizedDatabaseUri;
-import com.palantir.atlasdb.performance.backend.KeyValueServiceInstrumentation;
-import com.palantir.logsafe.exceptions.SafeRuntimeException;
-
-import io.airlift.airline.Arguments;
-import io.airlift.airline.Command;
-import io.airlift.airline.HelpOption;
-import io.airlift.airline.Option;
-import io.airlift.airline.SingleCommand;
-
 /**
  * The Atlas Perf(ormance) CLI is a tool for making and running AtlasDB performance tests.
  *
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/StreamTestSchema.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/StreamTestSchema.java
index 42de8a20bf2..745f9b4bfe6 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/StreamTestSchema.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/schema/StreamTestSchema.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.performance.schema;
 
-import java.io.File;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.schema.AtlasSchema;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
+import java.io.File;
 
 public final class StreamTestSchema implements AtlasSchema {
     private static final Schema STREAM_TEST_SCHEMA = generateSchema();
diff --git a/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/PerformanceResultsTest.java b/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/PerformanceResultsTest.java
index 85c0f7dc7c5..183670255e5 100644
--- a/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/PerformanceResultsTest.java
+++ b/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/PerformanceResultsTest.java
@@ -17,8 +17,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.performance.backend.CassandraKeyValueServiceInstrumentation;
 import java.util.List;
-
 import org.apache.commons.math3.stat.inference.TestUtils;
 import org.assertj.core.util.Lists;
 import org.junit.Test;
@@ -29,9 +30,6 @@
 import org.openjdk.jmh.runner.WorkloadParams;
 import org.openjdk.jmh.util.MultisetStatistics;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.performance.backend.CassandraKeyValueServiceInstrumentation;
-
 public class PerformanceResultsTest {
     private static final String SUITE_NAME = "PerformanceResults";
     private static final String BENCHMARK_NAME = "doStuff";
diff --git a/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/backend/MockKeyValueServiceInstrumentation.java b/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/backend/MockKeyValueServiceInstrumentation.java
index 9f7fc17dcb5..a1b20a90482 100644
--- a/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/backend/MockKeyValueServiceInstrumentation.java
+++ b/atlasdb-perf/src/test/java/com/palantir/atlasdb/performance/backend/MockKeyValueServiceInstrumentation.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.performance.backend;
 
+import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import java.net.InetSocketAddress;
-
 import org.mockito.Mockito;
 
-import com.palantir.atlasdb.spi.KeyValueServiceConfig;
-
 public class MockKeyValueServiceInstrumentation extends KeyValueServiceInstrumentation {
 
     public MockKeyValueServiceInstrumentation() {
diff --git a/atlasdb-persistent-lock-api/src/main/java/com/palantir/atlasdb/persistentlock/PersistentLockId.java b/atlasdb-persistent-lock-api/src/main/java/com/palantir/atlasdb/persistentlock/PersistentLockId.java
index cb1318d0582..02368d69288 100644
--- a/atlasdb-persistent-lock-api/src/main/java/com/palantir/atlasdb/persistentlock/PersistentLockId.java
+++ b/atlasdb-persistent-lock-api/src/main/java/com/palantir/atlasdb/persistentlock/PersistentLockId.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.persistentlock;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface PersistentLockId {
diff --git a/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateGenericTests.java b/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateGenericTests.java
index ecab05e90d2..ea215cbc677 100644
--- a/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateGenericTests.java
+++ b/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateGenericTests.java
@@ -19,13 +19,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.Sets;
 import java.util.Set;
-
 import org.assertj.core.api.Condition;
 import org.junit.Test;
 
-import com.google.common.collect.Sets;
-
 public class AutoDelegateGenericTests {
     @Test
     public void generatedInterfaceHasInterfaceMethods() {
diff --git a/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateInterfaceTests.java b/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateInterfaceTests.java
index c17ec66c631..0c83c5d753e 100644
--- a/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateInterfaceTests.java
+++ b/atlasdb-processors-tests/src/test/java/com/palantir/processors/AutoDelegateInterfaceTests.java
@@ -15,21 +15,18 @@
  */
 package com.palantir.processors;
 
+import static com.palantir.processors.TestingUtils.extractMethodsSatisfyingPredicate;
+import static com.palantir.processors.TestingUtils.extractNonStaticMethods;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import static com.palantir.processors.TestingUtils.extractMethodsSatisfyingPredicate;
-import static com.palantir.processors.TestingUtils.extractNonStaticMethods;
-
+import com.google.common.collect.Sets;
 import java.lang.reflect.Modifier;
 import java.util.Set;
-
 import org.junit.Test;
 
-import com.google.common.collect.Sets;
-
 public class AutoDelegateInterfaceTests {
 
     @Test
diff --git a/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java b/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java
index 7c808628ded..d7dfdc81227 100644
--- a/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java
+++ b/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java
@@ -15,6 +15,15 @@
  */
 package com.palantir.processors;
 
+import com.google.auto.service.AutoService;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.MapMaker;
+import com.google.common.collect.Sets;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+import com.squareup.javapoet.TypeVariableName;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -24,7 +33,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.FilerException;
@@ -45,16 +53,6 @@
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic;
 
-import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Sets;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
-import com.squareup.javapoet.TypeVariableName;
-
 @AutoService(Processor.class)
 public final class AutoDelegateProcessor extends AbstractProcessor {
     // We keep track of if this processor has been registered in a processing environment, to avoid registering it
diff --git a/atlasdb-processors/src/main/java/com/palantir/processors/ProcessorUtils.java b/atlasdb-processors/src/main/java/com/palantir/processors/ProcessorUtils.java
index d254eae6311..108979fd27e 100644
--- a/atlasdb-processors/src/main/java/com/palantir/processors/ProcessorUtils.java
+++ b/atlasdb-processors/src/main/java/com/palantir/processors/ProcessorUtils.java
@@ -15,9 +15,9 @@
  */
 package com.palantir.processors;
 
+import com.squareup.javapoet.ParameterSpec;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
@@ -25,8 +25,6 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Types;
 
-import com.squareup.javapoet.ParameterSpec;
-
 final class ProcessorUtils {
     private ProcessorUtils() {}
 
diff --git a/atlasdb-processors/src/main/java/com/palantir/processors/TypeToExtend.java b/atlasdb-processors/src/main/java/com/palantir/processors/TypeToExtend.java
index dc966208c88..bce0a136886 100644
--- a/atlasdb-processors/src/main/java/com/palantir/processors/TypeToExtend.java
+++ b/atlasdb-processors/src/main/java/com/palantir/processors/TypeToExtend.java
@@ -15,12 +15,12 @@
  */
 package com.palantir.processors;
 
+import com.google.common.collect.Sets;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
@@ -30,8 +30,6 @@
 import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.type.TypeMirror;
 
-import com.google.common.collect.Sets;
-
 final class TypeToExtend {
     private final TypeElement typeToExtend;
     private final PackageElement typePackage;
diff --git a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/AuxiliaryRemotingParameters.java b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/AuxiliaryRemotingParameters.java
index f931ccf148c..b16de7c22fd 100644
--- a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/AuxiliaryRemotingParameters.java
+++ b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/AuxiliaryRemotingParameters.java
@@ -16,12 +16,10 @@
 
 package com.palantir.atlasdb.config;
 
+import com.palantir.conjure.java.api.config.service.UserAgent;
 import java.util.function.Supplier;
-
 import org.immutables.value.Value;
 
-import com.palantir.conjure.java.api.config.service.UserAgent;
-
 /**
  * Additional parameters for clients to specify when connecting to remote services.
  */
diff --git a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/RemotingClientConfig.java b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/RemotingClientConfig.java
index 9e3a346a764..75ce3b2fc28 100644
--- a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/RemotingClientConfig.java
+++ b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/RemotingClientConfig.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableRemotingClientConfig.class)
 @JsonDeserialize(as = ImmutableRemotingClientConfig.class)
diff --git a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java
index a65b6fc65d6..916054ecc75 100644
--- a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java
+++ b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.config;
 
-import java.util.Optional;
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.conjure.java.api.config.service.ProxyConfiguration;
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
 import com.palantir.conjure.java.config.ssl.TrustContext;
+import java.util.Optional;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableServerListConfig.class)
 @JsonSerialize(as = ImmutableServerListConfig.class)
diff --git a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersion.java b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersion.java
index a7f3835ad13..3181fb8b2cd 100644
--- a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersion.java
+++ b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpProtocolVersion.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.http;
 
+import com.palantir.common.streams.KeyedStream;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
 
-import com.palantir.common.streams.KeyedStream;
-
 public enum AtlasDbHttpProtocolVersion {
     LEGACY_OR_UNKNOWN("1.0"),
     CONJURE_JAVA_RUNTIME("2.0");
diff --git a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/http/TargetFactory.java b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/http/TargetFactory.java
index 7d33ce83d97..a3c211bddb0 100644
--- a/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/http/TargetFactory.java
+++ b/atlasdb-remoting-api/src/main/java/com/palantir/atlasdb/http/TargetFactory.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.http;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.config.AuxiliaryRemotingParameters;
 import com.palantir.atlasdb.config.ServerListConfig;
 import com.palantir.conjure.java.config.ssl.TrustContext;
+import java.util.Optional;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
 
 public interface TargetFactory {
     <T> InstanceAndVersion<T> createProxy(
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java
index 79502c5a4a3..643baf7f16a 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java
@@ -15,8 +15,9 @@
  */
 package com.palantir.atlasdb.api;
 
+import com.palantir.atlasdb.table.description.TableMetadata;
+import com.palantir.common.annotation.Idempotent;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -25,9 +26,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.atlasdb.table.description.TableMetadata;
-import com.palantir.common.annotation.Idempotent;
-
 @Path("/atlasdb")
 public interface AtlasDbService {
 
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java
index 0efdbb57c84..9d997914d44 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.api;
 
-import javax.annotation.Nullable;
-
 import com.palantir.logsafe.Preconditions;
+import javax.annotation.Nullable;
 
 /*
  * <pre>
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java
index 84a18d50570..4f6052be6b2 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.api;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.logsafe.Preconditions;
+import java.util.Map;
 
 /**
  * For tables with named columns,
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java
index aff88e16d92..c55287e5ca6 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.api;
 
-import java.util.Arrays;
-
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
 
 /**
  * <pre>
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java
index 92d6a049b00..4dc5f30452b 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.api;
 
-import java.util.Collection;
-
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.logsafe.Preconditions;
+import java.util.Collection;
 
 /**
  * For tables with named columns,
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java
index 47c376f3ebd..323d1135038 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableSet;
@@ -54,6 +44,14 @@
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.base.BatchingVisitables;
 import com.palantir.logsafe.Preconditions;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
 
 public class AtlasDbServiceImpl implements AtlasDbService {
     private static final TableMetadata RAW_METADATA = TableMetadata.builder()
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java
index 84364390256..e489244b81d 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.impl;
 
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.CheckForNull;
-import javax.inject.Inject;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.CheckForNull;
+import javax.inject.Inject;
 
 public class TableMetadataCache {
     private final LoadingCache<String, TableMetadata> cache;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java
index 7608818a63e..bed1014e1c0 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
@@ -49,6 +43,11 @@
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.common.base.Throwables;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 public final class AtlasDeserializers {
 
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java
index 9d164a59c28..0e807606095 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import javax.inject.Inject;
-
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.palantir.atlasdb.api.RangeToken;
@@ -27,6 +25,7 @@
 import com.palantir.atlasdb.api.TableRowSelection;
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import javax.inject.Inject;
 
 public class AtlasJacksonModule {
     private final TableMetadataCache cache;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java
index 67b1e065866..a039f148e59 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Set;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.UnsignedBytes;
@@ -33,6 +30,8 @@
 import com.palantir.atlasdb.table.description.NameMetadataDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.util.Pair;
+import java.io.IOException;
+import java.util.Set;
 
 public final class AtlasSerializers {
 
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java
index 5ac68576bbe..74ba3218aa7 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.api.TableCell;
 import com.palantir.atlasdb.api.TableRange;
 import com.palantir.atlasdb.api.TableRowResult;
+import java.io.IOException;
 
 public class RangeTokenDeserializer extends StdDeserializer<RangeToken> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java
index 460d3b51403..0d5f0381913 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
-import javax.inject.Inject;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.palantir.atlasdb.api.RangeToken;
+import java.io.IOException;
+import javax.inject.Inject;
 
 public class RangeTokenSerializer extends StdSerializer<RangeToken> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java
index 20fae15fc3d..1f76b62fc2b 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableCellDeserializer extends StdDeserializer<TableCell> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java
index af0ad5307ae..943158770e5 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -29,6 +27,7 @@
 import com.palantir.atlasdb.table.description.DynamicColumnDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableCellSerializer extends StdSerializer<TableCell> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java
index 79f4a5b722b..d1968baf98e 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Map;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -26,6 +23,8 @@
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.util.Map;
 
 public class TableCellValDeserializer extends StdDeserializer<TableCellVal> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java
index f498f433f43..766b4165ab1 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -31,6 +27,9 @@
 import com.palantir.atlasdb.table.description.DynamicColumnDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.util.Map.Entry;
+import java.util.Set;
 
 public class TableCellValSerializer extends StdSerializer<TableCellVal> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java
index dbe92dfedf0..459d6ff6f34 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -42,6 +37,10 @@
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 import com.palantir.common.persist.Persistable;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
 
 public class TableMetadataDeserializer extends StdDeserializer<TableMetadata> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java
index 28e3e3245a1..6e40a84f007 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -33,6 +31,7 @@
 import com.palantir.atlasdb.table.description.NameMetadataDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableMetadataSerializer extends StdSerializer<TableMetadata> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java
index 9c77de430d1..a38d480670f 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableRangeDeserializer extends StdDeserializer<TableRange> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java
index 42b499015bd..7f9eddee614 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -24,6 +22,7 @@
 import com.palantir.atlasdb.api.TableRange;
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableRangeSerializer extends StdSerializer<TableRange> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java
index 431618cc4a0..9ba606ca168 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -31,6 +27,9 @@
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
 
 public class TableRowResultDeserializer extends StdDeserializer<TableRowResult> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java
index 59662dc94c5..1b2a94ea90e 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedMap;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -32,6 +27,10 @@
 import com.palantir.atlasdb.table.description.DynamicColumnDescription;
 import com.palantir.atlasdb.table.description.NamedColumnDescription;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
 
 public class TableRowResultSerializer extends StdSerializer<TableRowResult> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java
index 5658992a327..280d05a79e9 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -26,6 +24,7 @@
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableRowSelectionDeserializer extends StdDeserializer<TableRowSelection> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java
index b34b9776c3a..56e4e5441b9 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -24,6 +22,7 @@
 import com.palantir.atlasdb.api.TableRowSelection;
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.table.description.TableMetadata;
+import java.io.IOException;
 
 public class TableRowSelectionSerializer extends StdSerializer<TableRowSelection> {
     private static final long serialVersionUID = 1L;
diff --git a/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java
index 5dc91d5a481..136ac0f75fb 100644
--- a/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java
+++ b/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.proto.fork;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.CharBuffer;
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import com.google.common.io.BaseEncoding;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Descriptors.Descriptor;
@@ -39,6 +27,17 @@
 import com.google.protobuf.UnknownFieldSet;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.CharBuffer;
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Forked version of com.googlecode.protobuf.format.JsonFormat from protobuf-java-format-1.2
diff --git a/atlasdb-service/src/test/java/com/palantir/atlasdb/impl/AtlasDbServiceImplTest.java b/atlasdb-service/src/test/java/com/palantir/atlasdb/impl/AtlasDbServiceImplTest.java
index f9cb014dba9..0ee64ec83c3 100644
--- a/atlasdb-service/src/test/java/com/palantir/atlasdb/impl/AtlasDbServiceImplTest.java
+++ b/atlasdb-service/src/test/java/com/palantir/atlasdb/impl/AtlasDbServiceImplTest.java
@@ -19,12 +19,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AtlasDbServiceImplTest {
     private KeyValueService kvs;
diff --git a/atlasdb-service/src/test/java/com/palantir/atlasdb/jackson/AtlasDeserializersTest.java b/atlasdb-service/src/test/java/com/palantir/atlasdb/jackson/AtlasDeserializersTest.java
index e5c61df1ff4..215db07f357 100644
--- a/atlasdb-service/src/test/java/com/palantir/atlasdb/jackson/AtlasDeserializersTest.java
+++ b/atlasdb-service/src/test/java/com/palantir/atlasdb/jackson/AtlasDeserializersTest.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.jackson;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.table.description.NameComponentDescription;
 import com.palantir.atlasdb.table.description.NameMetadataDescription;
 import com.palantir.atlasdb.table.description.ValueType;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class AtlasDeserializersTest {
     private static final NameMetadataDescription NAME_METADATA_DESCRIPTION = NameMetadataDescription.create(
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/ComparingTimestampCache.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/ComparingTimestampCache.java
index 1cc602d8a0e..501969b6a42 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/ComparingTimestampCache.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/ComparingTimestampCache.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb;
 
-import java.util.Objects;
-import java.util.stream.Stream;
-
-import javax.annotation.Nullable;
-
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
 import com.palantir.atlasdb.cache.OffHeapTimestampCache;
 import com.palantir.atlasdb.cache.TimestampCache;
@@ -28,6 +23,9 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.util.Objects;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
 
 public final class ComparingTimestampCache implements TimestampCache {
     private final TimestampCache first;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractGetCandidateCellsForSweepingTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractGetCandidateCellsForSweepingTest.java
index f71f9f81d98..681058b43d1 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractGetCandidateCellsForSweepingTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractGetCandidateCellsForSweepingTest.java
@@ -18,13 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
@@ -41,6 +34,11 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.common.base.ClosableIterator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractGetCandidateCellsForSweepingTest {
     private final KvsManager kvsManager;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueServiceTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueServiceTest.java
index 716ec6d2d58..8199a603803 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueServiceTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueServiceTest.java
@@ -27,30 +27,6 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.function.Function;
-import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -91,6 +67,28 @@
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractKeyValueServiceTest {
     private final KvsManager kvsManager;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractMultiCasTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractMultiCasTest.java
index f99c64efc90..936f2f3d161 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractMultiCasTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractMultiCasTest.java
@@ -18,14 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -33,6 +25,12 @@
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AbstractMultiCasTest {
     private static final byte[] ROW_1 = PtBytes.toBytes("row1");
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AssertLockedKeyValueService.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AssertLockedKeyValueService.java
index 67848988da5..1db6f0f19fb 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AssertLockedKeyValueService.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AssertLockedKeyValueService.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.SortedMap;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -33,6 +29,9 @@
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.LockService;
 import com.palantir.logsafe.Preconditions;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.SortedMap;
 
 public class AssertLockedKeyValueService extends ForwardingKeyValueService {
     final KeyValueService delegate;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestDataBuilder.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestDataBuilder.java
index d1dd9073e30..b17024d2f2e 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestDataBuilder.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestDataBuilder.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Ints;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
 
 public class TestDataBuilder {
     private final KeyValueService kvs;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestResourceManager.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestResourceManager.java
index 2bbf454072f..7aa5683a314 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestResourceManager.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TestResourceManager.java
@@ -16,17 +16,15 @@
 
 package com.palantir.atlasdb.keyvalue.impl;
 
+import com.google.common.base.Suppliers;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.transaction.api.TransactionManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
-
 import org.junit.rules.ExternalResource;
 
-import com.google.common.base.Suppliers;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.transaction.api.TransactionManager;
-
 public class TestResourceManager extends ExternalResource implements KvsManager, TransactionManagerManager {
     private final Supplier<KeyValueService> getKvsSupplier;
     private final List<AutoCloseable> closeableResources = new ArrayList<>();
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TrackingKeyValueService.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TrackingKeyValueService.java
index f2b17a645d2..cdf070ea634 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TrackingKeyValueService.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TrackingKeyValueService.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -32,6 +29,8 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.common.base.ClosableIterator;
+import java.util.Map;
+import java.util.Set;
 
 public class TrackingKeyValueService extends ForwardingKeyValueService {
     private final Set<TableReference> tablesWrittenTo = Sets.newSetFromMap(Maps.newConcurrentMap());
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TransactionManagerManager.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TransactionManagerManager.java
index 9ba43ac47e1..0a5f31d9aa8 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TransactionManagerManager.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TransactionManagerManager.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Optional;
-
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Optional;
 
 public interface TransactionManagerManager {
     /**
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractBackgroundSweeperIntegrationTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractBackgroundSweeperIntegrationTest.java
index 6af4e696647..1b8dced0507 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractBackgroundSweeperIntegrationTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractBackgroundSweeperIntegrationTest.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.function.LongSupplier;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Ints;
@@ -57,6 +46,15 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.lock.SingleLockService;
 import com.palantir.timestamp.InMemoryTimestampService;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.LongSupplier;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractBackgroundSweeperIntegrationTest {
     static final TableReference TABLE_1 = TableReference.createFromFullyQualifiedName("foo.bar");
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTaskRunnerTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTaskRunnerTest.java
index 6a4cf4c9971..c9558ba2140 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTaskRunnerTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTaskRunnerTest.java
@@ -25,19 +25,6 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.LongSupplier;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -55,6 +42,17 @@
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.util.Pair;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.LongSupplier;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
 
 public abstract class AbstractSweepTaskRunnerTest extends AbstractSweepTest {
     protected static final int DEFAULT_BATCH_SIZE = 1000;
@@ -409,4 +407,3 @@ private SweepResults partialSweep(long ts) {
         return results;
     }
 }
-
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTest.java
index cd2866f6eaa..9201bf49eda 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTest.java
@@ -19,15 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -52,6 +43,13 @@
 import com.palantir.atlasdb.transaction.service.TransactionServices;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.timestamp.InMemoryTimestampService;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractSweepTest {
     protected static final String FULL_TABLE_NAME = "test_table.xyz_atlasdb_sweeper_test";
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractTargetedSweepTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractTargetedSweepTest.java
index 89ad874664f..9c86237ba6d 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractTargetedSweepTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractTargetedSweepTest.java
@@ -19,11 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import java.util.Optional;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -42,6 +37,9 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.lock.v2.TimelockService;
+import java.util.Optional;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AbstractTargetedSweepTest extends AbstractSweepTest {
     private static final TableReference TABLE_TO_BE_DROPPED = TableReference.createFromFullyQualifiedName("ts.drop");
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java
index 570340f0e31..e1e1d5fd13b 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTestUtils.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import java.util.function.Supplier;
-
-import org.awaitility.Awaitility;
-import org.awaitility.Duration;
-
 import com.palantir.atlasdb.cleaner.NoOpCleaner;
 import com.palantir.atlasdb.cleaner.api.Cleaner;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -51,6 +46,9 @@
 import com.palantir.timestamp.InMemoryTimestampService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.function.Supplier;
+import org.awaitility.Awaitility;
+import org.awaitility.Duration;
 
 public final class SweepTestUtils {
     private SweepTestUtils() {}
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImplIntegrationTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImplIntegrationTest.java
index 9491931490b..e58ec709a8e 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImplIntegrationTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/SweeperServiceImplIntegrationTest.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.sweep;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
+import org.junit.Before;
+import org.junit.Test;
 
 public class SweeperServiceImplIntegrationTest extends AbstractBackgroundSweeperIntegrationTest {
     private SweeperService sweeperService;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/progress/AbstractSweepProgressStoreTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/progress/AbstractSweepProgressStoreTest.java
index e8f866e17dc..0d1438d8267 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/progress/AbstractSweepProgressStoreTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/progress/AbstractSweepProgressStoreTest.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.sweep.progress;
 
-import java.util.Optional;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -29,6 +22,11 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.impl.KvsManager;
+import java.util.Optional;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public abstract class AbstractSweepProgressStoreTest {
     private static final TableReference TABLE = TableReference.createFromFullyQualifiedName("foo.bar");
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractDbTimestampBoundStoreTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractDbTimestampBoundStoreTest.java
index 2abf5ba8344..f0c883453de 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractDbTimestampBoundStoreTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractDbTimestampBoundStoreTest.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.timestamp;
 
+import com.palantir.timestamp.TimestampBoundStore;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.timestamp.TimestampBoundStore;
-
 public abstract class AbstractDbTimestampBoundStoreTest {
     protected TimestampBoundStore store;
 
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractTimestampServiceTests.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractTimestampServiceTests.java
index 91748f3d5d3..997f676de87 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractTimestampServiceTests.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/timestamp/AbstractTimestampServiceTests.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.timestamp;
 
+import com.palantir.timestamp.TimestampManagementService;
+import com.palantir.timestamp.TimestampRange;
+import com.palantir.timestamp.TimestampService;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
-import com.palantir.timestamp.TimestampManagementService;
-import com.palantir.timestamp.TimestampRange;
-import com.palantir.timestamp.TimestampService;
-
 public abstract class AbstractTimestampServiceTests {
     private static final long ONE_MILLION = 1_000_000;
     private static final long TWO_MILLION = 2 * ONE_MILLION;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java
index 63b55985670..74801b5e947 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java
@@ -20,19 +20,6 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -70,6 +57,17 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.lock.impl.LegacyTimelockService;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import org.junit.Assert;
+import org.junit.Test;
 
 @SuppressWarnings("CheckReturnValue")
 public abstract class AbstractSerializableTransactionTest extends AbstractTransactionTest {
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java
index 844016b7f61..b3d8c9b2b9e 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java
@@ -24,23 +24,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
-import java.util.stream.Collectors;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -96,6 +79,21 @@
 import com.palantir.lock.impl.LegacyTimelockService;
 import com.palantir.util.Pair;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import java.util.stream.Collectors;
+import org.junit.Test;
 
 @SuppressWarnings({"checkstyle:all","DefaultCharset"}) // TODO(someonebored): clean this horrible test class up!
 public abstract class AbstractTransactionTest extends TransactionTestSetup {
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CommitLockTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CommitLockTest.java
index d6e63064c6b..02bffbfc564 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CommitLockTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CommitLockTest.java
@@ -18,16 +18,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Map;
-import java.util.Optional;
-
-import org.junit.Assume;
-import org.junit.ClassRule;
-import org.junit.experimental.theories.DataPoints;
-import org.junit.experimental.theories.Theories;
-import org.junit.experimental.theories.Theory;
-import org.junit.runner.RunWith;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -53,6 +43,14 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockRequest;
 import com.palantir.lock.v2.LockResponse;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.Assume;
+import org.junit.ClassRule;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
 @RunWith(Theories.class)
 public class CommitLockTest extends TransactionTestSetup {
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/GetAsyncDelegate.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/GetAsyncDelegate.java
index 5bfd7c97a26..bdcd95448b9 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/GetAsyncDelegate.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/GetAsyncDelegate.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.palantir.atlasdb.futures.AtlasFutures;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.Transaction;
+import java.util.Map;
+import java.util.Set;
 
 public class GetAsyncDelegate extends ForwardingTransaction {
     private final Transaction delegate;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestConflictDetectionManagers.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestConflictDetectionManagers.java
index 772bd1ee636..47b54a5bd5f 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestConflictDetectionManagers.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestConflictDetectionManagers.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.Map;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.CacheLoader;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.util.Map;
 
 public final class TestConflictDetectionManagers {
     private TestConflictDetectionManagers() {}
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestTransactionManagerImpl.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestTransactionManagerImpl.java
index 22959e2fd70..c07dd8aa8e6 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestTransactionManagerImpl.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TestTransactionManagerImpl.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-
 import com.google.common.base.Suppliers;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
@@ -46,6 +40,11 @@
 import com.palantir.lock.v2.LockToken;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
 
 public class TestTransactionManagerImpl extends SerializableTransactionManager implements TestTransactionManager {
     static final TransactionConfig TRANSACTION_CONFIG = ImmutableTransactionConfig.builder().build();
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java
index 73c64058976..c31f77234cc 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTestSetup.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.rules.TemporaryFolder;
-import org.rocksdb.RocksDB;
-import org.rocksdb.RocksDBException;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
@@ -62,6 +50,16 @@
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
 import com.palantir.util.Pair;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.rules.TemporaryFolder;
+import org.rocksdb.RocksDB;
+import org.rocksdb.RocksDBException;
 
 public abstract class TransactionTestSetup {
     @ClassRule
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsAssert.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsAssert.java
index f620f9c0bb3..852381b1351 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsAssert.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsAssert.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.transaction.impl.metrics;
 
-import java.util.function.LongConsumer;
-
-import org.assertj.core.api.AbstractAssert;
-import org.assertj.core.api.WritableAssertionInfo;
-import org.assertj.core.internal.Objects;
-
 import com.codahale.metrics.Metric;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.logging.LoggingArgs;
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.function.LongConsumer;
+import org.assertj.core.api.AbstractAssert;
+import org.assertj.core.api.WritableAssertionInfo;
+import org.assertj.core.internal.Objects;
 
 public class TransactionOutcomeMetricsAssert extends
         AbstractAssert<TransactionOutcomeMetricsAssert, TransactionOutcomeMetrics> {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AllAtlasDbFastTests.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AllAtlasDbFastTests.java
index 1a2e815d80c..b3db7a9b965 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AllAtlasDbFastTests.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AllAtlasDbFastTests.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.atlasdb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
 import com.palantir.atlasdb.cleaner.AsyncPuncherTest;
 import com.palantir.atlasdb.cleaner.InMemorySweepTaskRunnerTest;
 import com.palantir.atlasdb.cleaner.PuncherTest;
 import com.palantir.atlasdb.compress.CompressionUtilsTest;
 import com.palantir.atlasdb.keyvalue.impl.RangeRequestsTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
 @SuiteClasses({
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AtlasDbTestCase.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AtlasDbTestCase.java
index ca2a0b2403e..2890dd255c5 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AtlasDbTestCase.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/AtlasDbTestCase.java
@@ -17,12 +17,6 @@
 
 import static org.mockito.Mockito.spy;
 
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-import org.junit.After;
-import org.junit.Before;
-
 import com.google.common.util.concurrent.MoreExecutors;
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -54,6 +48,10 @@
 import com.palantir.lock.LockService;
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.timestamp.InMemoryTimestampService;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import org.junit.After;
+import org.junit.Before;
 
 public class AtlasDbTestCase {
     protected LockClient lockClient;
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java
index 1b5c723af8f..2c4ce9ef75a 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java
@@ -19,16 +19,14 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.function.LongSupplier;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.base.Suppliers;
 import com.palantir.common.time.Clock;
 import com.palantir.common.time.SystemClock;
 import com.palantir.timestamp.InMemoryTimestampService;
 import com.palantir.timestamp.TimestampService;
+import java.util.function.LongSupplier;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AsyncPuncherTest {
 
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweepTaskRunnerTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweepTaskRunnerTest.java
index 22879a3af58..4ab456fba9b 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweepTaskRunnerTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweepTaskRunnerTest.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.atlasdb.cleaner;
 
+import com.palantir.atlasdb.keyvalue.api.SweepResults;
+import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
+import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
+import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest;
 import java.util.Optional;
 import java.util.stream.IntStream;
-
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import com.palantir.atlasdb.keyvalue.api.SweepResults;
-import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
-import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
-import com.palantir.atlasdb.sweep.AbstractSweepTaskRunnerTest;
-
 public class InMemorySweepTaskRunnerTest extends AbstractSweepTaskRunnerTest {
     @ClassRule
     public static final TestResourceManager TRM = TestResourceManager.inMemory();
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java
index 23176baac2a..1644fde644b 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/PuncherTest.java
@@ -17,21 +17,19 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import com.palantir.common.time.Clock;
 import java.util.Collection;
 import java.util.function.Supplier;
-
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
-import com.palantir.common.time.Clock;
-
 @RunWith(Parameterized.class)
 public class PuncherTest {
     private static final long GRANULARITY_MILLIS = 10;
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/compress/CompressionUtilsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/compress/CompressionUtilsTest.java
index b537d7cb5cb..5781e734ba7 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/compress/CompressionUtilsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/compress/CompressionUtilsTest.java
@@ -19,12 +19,10 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import com.palantir.atlasdb.table.description.ColumnValueDescription.Compression;
 import java.util.Arrays;
-
 import org.junit.Test;
 
-import com.palantir.atlasdb.table.description.ColumnValueDescription.Compression;
-
 public class CompressionUtilsTest {
     @Test
     public void testCompressAndDecompress() {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheckTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheckTest.java
index 8dfd9bc980c..66de6d2f54a 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheckTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/health/MetricsBasedTimelockHealthCheckTest.java
@@ -19,13 +19,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.transaction.impl.InstrumentedTimelockService;
 import com.palantir.lock.v2.TimelockService;
+import java.util.concurrent.TimeUnit;
+import org.junit.Test;
 
 public class MetricsBasedTimelockHealthCheckTest {
     private static final long METRICS_TICK_INTERVAL = TimeUnit.SECONDS.toMillis(5);
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java
index 685fa39f9bc..9883feec89d 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemorySerializableTransactionTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.transaction.impl.AbstractSerializableTransactionTest;
+import org.junit.ClassRule;
 
 public class MemorySerializableTransactionTest extends AbstractSerializableTransactionTest {
     @ClassRule
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemoryTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemoryTransactionTest.java
index 29141b71ed9..0ecedc5aec5 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemoryTransactionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/MemoryTransactionTest.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
 import com.palantir.atlasdb.transaction.impl.AbstractTransactionTest;
+import org.junit.ClassRule;
 
 public class MemoryTransactionTest extends AbstractTransactionTest {
     @ClassRule
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/ColumnRangeSelectionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/ColumnRangeSelectionTest.java
index bbd9abbd587..c043ea1905e 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/ColumnRangeSelectionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/ColumnRangeSelectionTest.java
@@ -19,10 +19,9 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import org.junit.Test;
 
 public class ColumnRangeSelectionTest {
     private static final byte[] BYTES_1 = PtBytes.toBytes("aaaaaaa");
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestTest.java
index f76134ca7c6..ef4ca4484dd 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestTest.java
@@ -17,11 +17,10 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class RangeRequestTest {
 
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestsTest.java
index 94109ecb6f7..3e80a50a485 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/RangeRequestsTest.java
@@ -17,15 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.api.RangeRequests;
 import java.util.Arrays;
 import java.util.Random;
-
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.api.RangeRequests;
-
 public class RangeRequestsTest {
 
     private static final byte[] BYTES_1 = PtBytes.toBytes("apple");
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueServiceTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueServiceTest.java
index 9267a0ff866..83bd21668d0 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueServiceTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueServiceTest.java
@@ -17,12 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Map;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -30,6 +24,10 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Map;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.junit.Test;
 
 @SuppressWarnings({"checkstyle:Indentation", "checkstyle:RightCurly"}) // Expectations syntax
 public class TableSplittingKeyValueServiceTest {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java
index 3d5b77a76e5..dd6d161389e 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.keyvalue.impl;
 
-import java.util.Collections;
-import java.util.Map.Entry;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableMap;
@@ -57,6 +46,15 @@
 import com.palantir.lock.LockServerOptions;
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.timestamp.InMemoryTimestampService;
+import java.util.Collections;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class TableTasksTest {
     private MetricsManager metricsManager;
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKvsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKvsTest.java
index 51bf98015d2..20aacf6bb55 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKvsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TracingKvsTest.java
@@ -17,22 +17,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.tracing.Tracer;
+import com.palantir.tracing.api.Span;
+import com.palantir.tracing.api.SpanObserver;
+import com.palantir.tracing.api.SpanType;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.junit.ClassRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.tracing.Tracer;
-import com.palantir.tracing.api.Span;
-import com.palantir.tracing.api.SpanObserver;
-import com.palantir.tracing.api.SpanType;
-
 public class TracingKvsTest extends AbstractKeyValueServiceTest {
     @ClassRule
     public static final TestResourceManager TRM = new TestResourceManager(() ->
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/ptobject/EncodingUtilsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/ptobject/EncodingUtilsTest.java
index d56feb4aac9..28674d0b99f 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/ptobject/EncodingUtilsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/ptobject/EncodingUtilsTest.java
@@ -19,15 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.SortedMap;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -37,6 +28,13 @@
 import com.palantir.atlasdb.ptobject.EncodingUtils.EncodingType;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.util.crypto.Sha256Hash;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.SortedMap;
+import org.junit.Test;
 
 @SuppressWarnings("checkstyle:all")
 public class EncodingUtilsTest {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointerTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointerTest.java
index 4abf577273c..49521c95ee2 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointerTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/AbstractTaskCheckpointerTest.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.schema;
 
+import com.google.common.collect.Maps;
+import com.palantir.atlasdb.AtlasDbTestCase;
+import com.palantir.atlasdb.transaction.api.Transaction;
+import com.palantir.atlasdb.transaction.api.TransactionTask;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Maps;
-import com.palantir.atlasdb.AtlasDbTestCase;
-import com.palantir.atlasdb.transaction.api.Transaction;
-import com.palantir.atlasdb.transaction.api.TransactionTask;
-
 public abstract class AbstractTaskCheckpointerTest extends AtlasDbTestCase {
     protected AbstractTaskCheckpointer checkpointer;
 
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/NamespaceTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/NamespaceTest.java
index 6418fcd19f9..6e4e990a30d 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/NamespaceTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/NamespaceTest.java
@@ -17,12 +17,10 @@
 
 import static org.junit.Assert.fail;
 
+import com.palantir.atlasdb.keyvalue.api.Namespace;
 import java.util.regex.Pattern;
-
 import org.junit.Test;
 
-import com.palantir.atlasdb.keyvalue.api.Namespace;
-
 public class NamespaceTest {
 
     private void expectSuccess(String string, Pattern pattern) {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/TableMigratorTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/TableMigratorTest.java
index 47723651248..c58b40977a3 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/TableMigratorTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/TableMigratorTest.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.schema;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.commons.lang3.mutable.MutableLong;
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -51,6 +44,11 @@
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.common.exception.TableMappingNotFoundException;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.apache.commons.lang3.mutable.MutableLong;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class TableMigratorTest extends AtlasDbTestCase {
     @Test
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTest.java
index b70cd3a6ff8..3891193e1ad 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTest.java
@@ -17,13 +17,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Multimap;
@@ -44,6 +37,11 @@
 import com.palantir.atlasdb.table.description.Schemas;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.RuntimeTransactionTask;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class IndexTest extends AtlasDbTestCase {
 
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTestSchema.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTestSchema.java
index 496115b9c6b..8c1113fe228 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTestSchema.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/IndexTestSchema.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.schema.indexing;
 
-import java.io.File;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.ValueByteOrder;
 import com.palantir.atlasdb.schema.AtlasSchema;
@@ -26,6 +24,7 @@
 import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
+import java.io.File;
 
 public class IndexTestSchema implements AtlasSchema {
     public static final AtlasSchema INSTANCE = new IndexTestSchema();
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTest.java
index 97282078e89..bdbe7d373bf 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTest.java
@@ -27,31 +27,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -94,6 +69,29 @@
 import com.palantir.common.io.ForwardingInputStream;
 import com.palantir.util.Pair;
 import com.palantir.util.crypto.Sha256Hash;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class StreamTest extends AtlasDbTestCase {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTestSchema.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTestSchema.java
index e1f98902e49..52f5b380ac7 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTestSchema.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/StreamTestSchema.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.schema.stream;
 
-import java.io.File;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.schema.AtlasSchema;
 import com.palantir.atlasdb.table.description.OptionalType;
 import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
+import java.io.File;
 
 public class StreamTestSchema implements AtlasSchema {
     public static final AtlasSchema INSTANCE = new StreamTestSchema();
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreTest.java
index f4d267b6421..559bf046dc3 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/priority/SweepPriorityStoreTest.java
@@ -17,14 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.OptionalLong;
-import java.util.concurrent.ExecutorService;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -34,6 +26,12 @@
 import com.palantir.atlasdb.sweep.SweepTestUtils;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.concurrent.PTExecutors;
+import java.util.OptionalLong;
+import java.util.concurrent.ExecutorService;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class SweepPriorityStoreTest {
     private ExecutorService exec;
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreTest.java
index 5247da203b3..47fd796c05a 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/progress/SweepProgressStoreTest.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.sweep.progress;
 
-import org.junit.ClassRule;
-
 import com.palantir.atlasdb.keyvalue.impl.TestResourceManager;
+import org.junit.ClassRule;
 
 public class SweepProgressStoreTest extends AbstractSweepProgressStoreTest {
     @ClassRule
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweepTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweepTest.java
index b5ed9bd84e6..5e2e70cb848 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweepTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweepTest.java
@@ -22,15 +22,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -46,6 +37,13 @@
 import com.palantir.atlasdb.transaction.api.PreCommitCondition;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionConflictException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 public class TargetedSweepTest extends AtlasDbTestCase {
     private static final TableReference TABLE_CONS = TableReference.createFromFullyQualifiedName("test.1");
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/CachingTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/CachingTransactionTest.java
index 0cc5116f542..729c0686de6 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/CachingTransactionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/CachingTransactionTest.java
@@ -18,6 +18,18 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedMap;
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.util.concurrent.Futures;
+import com.palantir.atlasdb.encoding.PtBytes;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.transaction.api.Transaction;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
@@ -26,26 +38,12 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
-
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.util.concurrent.Futures;
-import com.palantir.atlasdb.encoding.PtBytes;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
-import com.palantir.atlasdb.keyvalue.api.RowResult;
-import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.transaction.api.Transaction;
-
 @RunWith(Parameterized.class)
 public class CachingTransactionTest {
     private static final byte[] ROW_BYTES = "row".getBytes();
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java
index 39490a387b4..70e82ac1fa5 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java
@@ -36,44 +36,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Random;
-import java.util.SortedMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.commons.lang3.mutable.MutableLong;
-import org.apache.commons.lang3.tuple.Pair;
-import org.hamcrest.Matchers;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.Sequence;
-import org.jmock.lib.concurrent.DeterministicScheduler;
-import org.jmock.lib.concurrent.Synchroniser;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
@@ -147,6 +109,42 @@
 import com.palantir.lock.v2.LockImmutableTimestampResponse;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.TimestampService;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.SortedMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.apache.commons.lang3.mutable.MutableLong;
+import org.apache.commons.lang3.tuple.Pair;
+import org.hamcrest.Matchers;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.Sequence;
+import org.jmock.lib.concurrent.DeterministicScheduler;
+import org.jmock.lib.concurrent.Synchroniser;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @SuppressWarnings("checkstyle:all")
 @RunWith(Parameterized.class)
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionManagerTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionManagerTest.java
index 172356aae50..988d259459d 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionManagerTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TransactionManagerTest.java
@@ -23,11 +23,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.UUID;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.google.common.util.concurrent.MoreExecutors;
 import com.palantir.atlasdb.cache.DefaultTimestampCache;
 import com.palantir.atlasdb.cleaner.NoOpCleaner;
@@ -51,6 +46,9 @@
 import com.palantir.lock.v2.TimestampAndPartition;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.UUID;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class TransactionManagerTest extends TransactionTestSetup {
     @ClassRule
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsTest.java
index 0fb45496429..9aed911b837 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/metrics/TransactionOutcomeMetricsTest.java
@@ -17,12 +17,6 @@
 
 import static com.palantir.atlasdb.transaction.impl.metrics.TransactionOutcomeMetricsAssert.assertThat;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.IntStream;
-
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -31,6 +25,10 @@
 import com.palantir.atlasdb.util.MetricsManager;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.IntStream;
+import org.junit.Test;
 
 public class TransactionOutcomeMetricsTest {
     private static final Namespace NAMESPACE = Namespace.DEFAULT_NAMESPACE;
diff --git a/build.gradle b/build.gradle
index e5aef39d40a..7fee585eaaa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,10 +16,9 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8'
         classpath 'gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.22.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:1.8.2'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.49.1'
         classpath 'gradle.plugin.com.palantir.gradle.gitversion:gradle-git-version:0.11.0'
         classpath 'com.palantir.sls-packaging:gradle-sls-packaging:3.8.1'
-        classpath 'com.netflix.nebula:nebula-dependency-recommender:8.0.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
         classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.2.0'
@@ -28,7 +27,6 @@ buildscript {
 
 plugins {
     id 'com.github.johnrengelman.shadow' version '5.1.0'
-    id 'com.palantir.configuration-resolver' version '0.4.0'
     id 'org.unbroken-dome.test-sets' version '2.1.1'
     id 'com.google.protobuf' version '0.8.10'
 }
@@ -39,6 +37,8 @@ repositories {
         url 'https://dl.bintray.com/palantir/releases/'
     }
 }
+apply plugin: 'com.palantir.baseline'
+apply plugin: 'com.palantir.baseline'
 apply plugin: 'com.palantir.baseline-config'
 apply plugin: 'com.palantir.baseline-circleci'
 apply plugin: 'com.palantir.git-version'
@@ -58,7 +58,6 @@ task printLastVersion {
 
 allprojects {
     apply plugin: 'java-library'
-    apply plugin: 'nebula.dependency-recommender'
     apply plugin: 'org.inferred.processors'  // installs the "processor" configuration needed for baseline-error-prone
 
     // temporary until this is merged/fixed inside gradle-processors
@@ -88,7 +87,6 @@ allprojects {
 }
 
 subprojects {
-    apply plugin: 'com.palantir.configuration-resolver'
     task allDeps(type: DependencyReportTask) {}
 }
 
diff --git a/cassandra-partitioner/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/dht/AtlasDbOrderedPartitioner.java b/cassandra-partitioner/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/dht/AtlasDbOrderedPartitioner.java
index 30af0d390f3..c5a1a59ed01 100644
--- a/cassandra-partitioner/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/dht/AtlasDbOrderedPartitioner.java
+++ b/cassandra-partitioner/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/dht/AtlasDbOrderedPartitioner.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.cassandra.dht;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.security.SecureRandom;
@@ -22,7 +24,6 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.cassandra.dht.ByteOrderedPartitioner;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Token;
@@ -33,9 +34,6 @@
 import org.apache.cassandra.utils.Pair;
 import org.apache.commons.lang3.ArrayUtils;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
 public class AtlasDbOrderedPartitioner extends ByteOrderedPartitioner {
     private final Random r = new SecureRandom();
     private final AtomicInteger indexCounter = new AtomicInteger(r.nextInt(6));
diff --git a/commons-annotations/src/main/java/com/palantir/atlasdb/metrics/Timed.java b/commons-annotations/src/main/java/com/palantir/atlasdb/metrics/Timed.java
index 5bdb4bd882f..1e9ef8199a5 100644
--- a/commons-annotations/src/main/java/com/palantir/atlasdb/metrics/Timed.java
+++ b/commons-annotations/src/main/java/com/palantir/atlasdb/metrics/Timed.java
@@ -30,4 +30,3 @@
 @Target(ElementType.METHOD)
 public @interface Timed {
 }
-
diff --git a/commons-annotations/src/main/java/com/palantir/common/annotation/Immutable.java b/commons-annotations/src/main/java/com/palantir/common/annotation/Immutable.java
index 440e7523b40..52276252b0b 100644
--- a/commons-annotations/src/main/java/com/palantir/common/annotation/Immutable.java
+++ b/commons-annotations/src/main/java/com/palantir/common/annotation/Immutable.java
@@ -31,4 +31,3 @@
 public @interface Immutable {
 // marker annotation
 }
-
diff --git a/commons-api/src/main/java/com/palantir/util/VersionStrings.java b/commons-api/src/main/java/com/palantir/util/VersionStrings.java
index 9e4fd876ad9..398ad3674a6 100644
--- a/commons-api/src/main/java/com/palantir/util/VersionStrings.java
+++ b/commons-api/src/main/java/com/palantir/util/VersionStrings.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.util;
 
-import java.util.Iterator;
-
 import com.google.common.base.Splitter;
+import java.util.Iterator;
 
 public final class VersionStrings {
     private VersionStrings() {
diff --git a/commons-api/src/main/java/com/palantir/util/jmx/AbstractOperationStats.java b/commons-api/src/main/java/com/palantir/util/jmx/AbstractOperationStats.java
index 2daf25f193c..54dc4a21b17 100644
--- a/commons-api/src/main/java/com/palantir/util/jmx/AbstractOperationStats.java
+++ b/commons-api/src/main/java/com/palantir/util/jmx/AbstractOperationStats.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.util.jmx;
 
+import com.palantir.annotations.PgNotExtendableApi;
+import com.palantir.annotations.PgPublicApi;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicLong;
-
 import javax.management.MXBean;
 
-import com.palantir.annotations.PgNotExtendableApi;
-import com.palantir.annotations.PgPublicApi;
-
 /*
  * TODO (carrino) consider abstracting this a little bit further so that this
  * isn't time-specific (e.g., this class could be useful for tracking statistics
diff --git a/commons-api/src/main/java/com/palantir/util/sql/SqlStats.java b/commons-api/src/main/java/com/palantir/util/sql/SqlStats.java
index 7af0bf29e8b..430471c9a2c 100644
--- a/commons-api/src/main/java/com/palantir/util/sql/SqlStats.java
+++ b/commons-api/src/main/java/com/palantir/util/sql/SqlStats.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.util.sql;
 
+import com.palantir.util.JMXUtils;
+import com.palantir.util.Pair;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -22,9 +24,6 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.palantir.util.JMXUtils;
-import com.palantir.util.Pair;
-
 /**
  * MXBean which tracks statistics for all SQL queries made by the server.
  */
@@ -173,4 +172,3 @@ public void incrementClearTempTableByTruncate() {
         clearTempTableByTruncateCount.incrementAndGet();
     }
 }
-
diff --git a/commons-db/src/main/java/com/palantir/db/oracle/JdbcHandler.java b/commons-db/src/main/java/com/palantir/db/oracle/JdbcHandler.java
index 8e5d6955fe2..69787a39387 100644
--- a/commons-db/src/main/java/com/palantir/db/oracle/JdbcHandler.java
+++ b/commons-db/src/main/java/com/palantir/db/oracle/JdbcHandler.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.db.oracle;
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.io.OutputStream;
 import java.sql.Blob;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
 /**
  * JdbcHandler allows Oracle dependent logic to be injected into the SQL
  * dependent classes that support both Legacy DB and AtlasDB's Dbkvs
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java b/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java
index a103b0694c6..c655fa87f34 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/ConnectionSupplier.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.nexus.db;
 
+import com.palantir.exception.PalantirSqlException;
 import java.io.Closeable;
 import java.sql.Connection;
 import java.util.function.Supplier;
 
-import com.palantir.exception.PalantirSqlException;
-
 public interface ConnectionSupplier extends Supplier<Connection>, Closeable {
 
     /**
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/DBType.java b/commons-db/src/main/java/com/palantir/nexus/db/DBType.java
index 405fc216a23..2e7c9dac2f5 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/DBType.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/DBType.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.nexus.db;
 
-import java.sql.Connection;
-
-import javax.annotation.Nullable;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
 import com.palantir.sql.Connections;
+import java.sql.Connection;
+import javax.annotation.Nullable;
 
 /**
  * Extensibility point for adding more type of databases.
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/ReentrantConnectionSupplier.java b/commons-db/src/main/java/com/palantir/nexus/db/ReentrantConnectionSupplier.java
index 79b54b29a1a..e597df7dc56 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/ReentrantConnectionSupplier.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/ReentrantConnectionSupplier.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db;
 
+import com.palantir.exception.PalantirSqlException;
 import java.io.Closeable;
 import java.sql.Connection;
 
-import com.palantir.exception.PalantirSqlException;
-
 public interface ReentrantConnectionSupplier extends ConnectionSupplier, Closeable {
 
     /**
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/ResourceCreationLocation.java b/commons-db/src/main/java/com/palantir/nexus/db/ResourceCreationLocation.java
index 92fd1dc9845..5f84a820dbd 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/ResourceCreationLocation.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/ResourceCreationLocation.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.nexus.db;
 
+import com.google.common.base.MoreObjects;
 import java.io.Serializable;
-
 import org.joda.time.format.ISODateTimeFormat;
 
-import com.google.common.base.MoreObjects;
-
 /**
  * A RuntimeException that represents the creation location of a resource (e.g. JDBC Connection or
  * ResultSet) to help identify potential resource leaks. This instance tracks the stack trace of
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/ThreadConfinedProxy.java b/commons-db/src/main/java/com/palantir/nexus/db/ThreadConfinedProxy.java
index b2a9b5a0ef6..960d258a737 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/ThreadConfinedProxy.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/ThreadConfinedProxy.java
@@ -15,24 +15,21 @@
  */
 package com.palantir.nexus.db;
 
+import com.google.common.base.Throwables;
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.palantir.common.proxy.DelegatingInvocationHandler;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.util.AssertUtils;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.concurrent.Callable;
-
 import javax.annotation.concurrent.GuardedBy;
-
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Throwables;
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.palantir.common.proxy.DelegatingInvocationHandler;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.util.AssertUtils;
-
 /**
  *  Dynamic Proxy for confining an object to a particular thread, but allowing explicit handoff.
  *
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SimpleSqlProfiler.java b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SimpleSqlProfiler.java
index 4db7f655891..d46d942c419 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SimpleSqlProfiler.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SimpleSqlProfiler.java
@@ -15,21 +15,18 @@
  */
 package com.palantir.nexus.db.monitoring.profiler;
 
-import java.util.Collection;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.palantir.common.concurrent.ExecutorInheritableThreadLocal;
 import com.palantir.util.AssertUtils;
 import com.palantir.util.sql.SqlCallStats;
+import java.util.Collection;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 enum SimpleSqlProfiler implements SqlProfiler {
     INSTANCE;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SqlProfiler.java b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SqlProfiler.java
index de390afa84a..b0cab90624f 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SqlProfiler.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/profiler/SqlProfiler.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.nexus.db.monitoring.profiler;
 
-import java.util.Collection;
-
 import com.palantir.nexus.db.sql.BasicSQL;
 import com.palantir.util.sql.SqlCallStats;
+import java.util.Collection;
 
 /**
  * Code extracted from {@link BasicSQL}. This provides one of several competing and overlapping
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/CombinedSqlTimer.java b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/CombinedSqlTimer.java
index 3758a486c82..341df7dee6e 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/CombinedSqlTimer.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/CombinedSqlTimer.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.nexus.db.monitoring.timer;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
+import java.util.List;
 
 final class CombinedSqlTimer implements SqlTimer {
     private final List<SqlTimer> sqlTimers;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/SqlStatsSqlTimer.java b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/SqlStatsSqlTimer.java
index 163c83563bf..4dd70a60e05 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/SqlStatsSqlTimer.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/monitoring/timer/SqlStatsSqlTimer.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.nexus.db.monitoring.timer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
 import com.palantir.util.jmx.OperationTimer;
 import com.palantir.util.jmx.OperationTimer.TimingState;
 import com.palantir.util.timer.LoggingOperationTimer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class SqlStatsSqlTimer implements SqlTimer {
     private final Logger logger = SqlLoggers.LOGGER;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/BaseConnectionManager.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/BaseConnectionManager.java
index 9045e977a17..3fffac77387 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/BaseConnectionManager.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/BaseConnectionManager.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.palantir.exception.PalantirSqlException;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import com.palantir.exception.PalantirSqlException;
-
 public abstract class BaseConnectionManager implements ConnectionManager {
     @Override
     public Connection getConnectionUnchecked() {
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/CloseTracking.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/CloseTracking.java
index b66c2f42d7d..123006a0379 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/CloseTracking.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/CloseTracking.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.nexus.db.pool;
 
-import java.sql.Connection;
-import java.util.Arrays;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.FinalizableReferenceQueue;
 import com.google.common.base.FinalizableWeakReference;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.palantir.nexus.db.ResourceCreationLocation;
+import java.sql.Connection;
+import java.util.Arrays;
+import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CloseTracking {
     private static final Logger log = LoggerFactory.getLogger(CloseTracking.class);
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/ConnectionManager.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/ConnectionManager.java
index d7134fdc3e8..e7aa071c939 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/ConnectionManager.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/ConnectionManager.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.palantir.nexus.db.DBType;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import com.palantir.nexus.db.DBType;
-
 /**
  * A SQL connection pool that can be flushed.
  *
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/ReentrantManagedConnectionSupplier.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/ReentrantManagedConnectionSupplier.java
index 1b1b6574d7a..7eaeb8d3b46 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/ReentrantManagedConnectionSupplier.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/ReentrantManagedConnectionSupplier.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.nexus.db.pool;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.annotation.concurrent.ThreadSafe;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.nexus.db.ReentrantConnectionSupplier;
+import java.sql.Connection;
+import java.sql.SQLException;
+import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
 public class ReentrantManagedConnectionSupplier implements ReentrantConnectionSupplier {
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/ResourceTypes.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/ResourceTypes.java
index 8cd61a32d52..7c18ef0d044 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/ResourceTypes.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/ResourceTypes.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.palantir.nexus.db.DBType;
+import com.palantir.proxy.util.ProxyUtils;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.palantir.nexus.db.DBType;
-import com.palantir.proxy.util.ProxyUtils;
-
 public final class ResourceTypes {
     private ResourceTypes() {
         // no
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java
index b4586835233..4bb87419666 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.nexus.db.pool;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.palantir.logsafe.Preconditions;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -22,17 +26,10 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.palantir.logsafe.Preconditions;
-
 public final class RetriableTransactions {
     private static final Logger log = LoggerFactory.getLogger(RetriableTransactions.class);
 
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableWriteTransaction.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableWriteTransaction.java
index d7c2363d7e7..fc62e9a9e90 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableWriteTransaction.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableWriteTransaction.java
@@ -17,7 +17,6 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-
 import javax.annotation.Nullable;
 
 /**
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AbstractAgnosticResultRow.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AbstractAgnosticResultRow.java
index b3247b11be3..bc39dd78bd7 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AbstractAgnosticResultRow.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AbstractAgnosticResultRow.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.palantir.common.base.Throwables;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.sql.SQLException;
 import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.common.base.Throwables;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-
 public abstract class AbstractAgnosticResultRow implements AgnosticResultRow {
 
     private static final Logger log = LoggerFactory.getLogger(AbstractAgnosticResultRow.class);
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRow.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRow.java
index fa34bfa49f1..bef604b38ae 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRow.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRow.java
@@ -16,12 +16,10 @@
 package com.palantir.nexus.db.sql;
 
 
+import com.palantir.exception.PalantirSqlException;
 import java.io.InputStream;
-
 import org.joda.time.DateTime;
 
-import com.palantir.exception.PalantirSqlException;
-
 public interface AgnosticLightResultRow extends AgnosticResultRow {
 
     InputStream getBinaryInputStream(final String colname) throws PalantirSqlException;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRowImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRowImpl.java
index b19356dc3bf..2fe31869be7 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRowImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultRowImpl.java
@@ -16,6 +16,11 @@
 package com.palantir.nexus.db.sql;
 
 
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
+import com.palantir.sql.Blobs;
+import com.palantir.sql.Clobs;
+import com.palantir.sql.ResultSets;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.sql.Blob;
@@ -23,15 +28,8 @@
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Map;
-
 import org.joda.time.DateTime;
 
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-import com.palantir.sql.Blobs;
-import com.palantir.sql.Clobs;
-import com.palantir.sql.ResultSets;
-
 public class AgnosticLightResultRowImpl extends AbstractAgnosticResultRow implements AgnosticLightResultRow {
     private ResultSet results;
 
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSet.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSet.java
index 57723e027b6..88afd5b9a53 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSet.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSet.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.palantir.common.visitor.Visitor;
 import java.io.Closeable;
 import java.util.Iterator;
 
-import com.palantir.common.visitor.Visitor;
-
 /**
  * This result set only loads one row at a time, and thus provides a
  * low-overhead solution for large queries.  Read the comments about the iterator before
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSetImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSetImpl.java
index c9fde2df020..15577e84230 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSetImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticLightResultSetImpl.java
@@ -16,16 +16,6 @@
 package com.palantir.nexus.db.sql;
 
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.common.base.Throwables;
 import com.palantir.common.visitor.Visitor;
 import com.palantir.exception.PalantirInterruptedException;
@@ -36,6 +26,14 @@
 import com.palantir.nexus.db.sql.BasicSQLString.FinalSQLString;
 import com.palantir.sql.ResultSets;
 import com.palantir.util.AssertUtils;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This result set only loads one row at a time, and thus provides a
@@ -233,4 +231,3 @@ public void visitAndClose(Visitor<? super AgnosticLightResultRow> visitor) throw
         }
     }
 }
-
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultRowImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultRowImpl.java
index faf9ed62d74..4f85f69c9f5 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultRowImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultRowImpl.java
@@ -16,6 +16,10 @@
 package com.palantir.nexus.db.sql;
 
 
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
+import com.palantir.sql.Blobs;
+import com.palantir.sql.Clobs;
 import java.math.BigDecimal;
 import java.sql.Blob;
 import java.sql.Clob;
@@ -23,11 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-import com.palantir.sql.Blobs;
-import com.palantir.sql.Clobs;
-
 public class AgnosticResultRowImpl extends AbstractAgnosticResultRow {
     private List<Object> columns;
 
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultSetImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultSetImpl.java
index 5aacba4f957..a22e62dfb9f 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultSetImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/AgnosticResultSetImpl.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.ResultSetMetaData;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.DBType;
 import com.palantir.sql.ResultSets;
+import java.sql.ResultSetMetaData;
+import java.util.List;
+import java.util.Map;
 
 public class AgnosticResultSetImpl implements AgnosticResultSet {
     private final List<List<Object>> results;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java
index 7f71154f526..f776b27c1d6 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java
@@ -15,6 +15,27 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.palantir.common.base.Throwables;
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.common.concurrent.ThreadNamingCallable;
+import com.palantir.db.oracle.JdbcHandler;
+import com.palantir.db.oracle.JdbcHandler.BlobHandler;
+import com.palantir.exception.PalantirInterruptedException;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.nexus.db.DBType;
+import com.palantir.nexus.db.ResourceCreationLocation;
+import com.palantir.nexus.db.monitoring.timer.SqlTimer;
+import com.palantir.nexus.db.sql.BasicSQLString.FinalSQLString;
+import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
+import com.palantir.sql.Connections;
+import com.palantir.sql.PreparedStatements;
+import com.palantir.sql.ResultSets;
+import com.palantir.util.sql.VerboseSQLException;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -45,35 +66,11 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
-
 import javax.annotation.Nullable;
-
 import org.apache.commons.lang3.Validate;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.palantir.common.base.Throwables;
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.common.concurrent.ThreadNamingCallable;
-import com.palantir.db.oracle.JdbcHandler;
-import com.palantir.db.oracle.JdbcHandler.BlobHandler;
-import com.palantir.exception.PalantirInterruptedException;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.nexus.db.DBType;
-import com.palantir.nexus.db.ResourceCreationLocation;
-import com.palantir.nexus.db.monitoring.timer.SqlTimer;
-import com.palantir.nexus.db.sql.BasicSQLString.FinalSQLString;
-import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
-import com.palantir.sql.Connections;
-import com.palantir.sql.PreparedStatements;
-import com.palantir.sql.ResultSets;
-import com.palantir.util.sql.VerboseSQLException;
-
 public abstract class BasicSQL {
 
     public interface SqlConfig {
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQLUtils.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQLUtils.java
index b0c10f988ca..ff62df3e578 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQLUtils.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQLUtils.java
@@ -15,6 +15,12 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.palantir.common.concurrent.ThreadNamingCallable;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
+import com.palantir.nexus.db.SQLConstants;
+import com.palantir.nexus.db.ThreadConfinedProxy;
+import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
 import java.io.ByteArrayInputStream;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -25,21 +31,12 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
-
 import javax.annotation.Nullable;
-
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.common.concurrent.ThreadNamingCallable;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-import com.palantir.nexus.db.SQLConstants;
-import com.palantir.nexus.db.ThreadConfinedProxy;
-import com.palantir.nexus.db.sql.monitoring.logger.SqlLoggers;
-
 public class BasicSQLUtils {
 
     /**
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnection.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnection.java
index 85f1b561973..119183150cc 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnection.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnection.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.Connection;
-
 import com.palantir.exception.PalantirSqlException;
+import java.sql.Connection;
 
 public interface ConnectionBackedSqlConnection extends PalantirSqlConnection {
     public void close() throws PalantirSqlException;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java
index fde5c004cb7..3c4a081e877 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.util.function.Supplier;
-
 import com.palantir.exception.PalantirInterruptedException;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.SQLString.RegisteredSQLString;
 import com.palantir.sql.Connections;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.util.function.Supplier;
 
 /**
  * Prefer {@link PalantirSqlConnectionImpl} to this class.
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java
index 816e532ca31..8e31d5d25bb 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java
@@ -15,20 +15,6 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.concurrent.ExecutorService;
-
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Preconditions;
 import com.palantir.common.base.Throwables;
 import com.palantir.db.oracle.JdbcHandler.ArrayHandler;
@@ -43,6 +29,18 @@
 import com.palantir.sql.PreparedStatements;
 import com.palantir.sql.ResultSets;
 import com.palantir.util.streams.PTStreams;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.concurrent.ExecutorService;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Routines for issuing SQL statements to the database.
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java
index ca8d81ae7a3..8c4ad5d73e5 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java
@@ -15,6 +15,14 @@
  */
 package com.palantir.nexus.db.sql;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
+import com.palantir.common.exception.PalantirRuntimeException;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.nexus.db.DBType;
+import com.palantir.nexus.db.SqlClause;
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,20 +33,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Pattern;
-
 import javax.annotation.concurrent.GuardedBy;
-
 import org.apache.commons.lang3.Validate;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
-import com.palantir.common.exception.PalantirRuntimeException;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.nexus.db.DBType;
-import com.palantir.nexus.db.SqlClause;
-
 // class extended by other projects
 @SuppressWarnings("WeakerAccess")
 public class SQLString extends BasicSQLString {
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnection.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnection.java
index f4ac57fe37f..9362ccc7dd6 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnection.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnection.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-
 import com.palantir.exception.PalantirInterruptedException;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.SQLString.RegisteredSQLString;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
 
 public interface SqlConnection {
     void executeUnregisteredQuery(String sql, Object... vs) throws PalantirSqlException;
@@ -62,4 +61,3 @@ public interface SqlConnection {
 
     Connection getUnderlyingConnection() throws PalantirSqlException;
 }
-
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java
index 937fe6eb62a..df11361bf54 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.palantir.exception.PalantirInterruptedException;
@@ -29,6 +24,9 @@
 import com.palantir.nexus.db.sql.BasicSQLString.FinalSQLString;
 import com.palantir.nexus.db.sql.SQLString.RegisteredSQLString;
 import com.palantir.sql.PreparedStatements;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import javax.annotation.Nullable;
 
 /**
  * Helper methods for {@link PalantirSqlConnection} implementations. These were originally
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/monitoring/logger/SqlLoggers.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/monitoring/logger/SqlLoggers.java
index 29eb468a7ca..3933254c44d 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/monitoring/logger/SqlLoggers.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/monitoring/logger/SqlLoggers.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.nexus.db.sql.monitoring.logger;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 @SuppressFBWarnings("SLF4J_LOGGER_SHOULD_BE_PRIVATE")
 public class SqlLoggers {
     public static final Logger LOGGER = LoggerFactory.getLogger("com.palantir.nexus.db.SQL");
diff --git a/commons-db/src/main/java/com/palantir/nexus/streaming/PTInputStream.java b/commons-db/src/main/java/com/palantir/nexus/streaming/PTInputStream.java
index 531771c91f1..e9140e1963b 100644
--- a/commons-db/src/main/java/com/palantir/nexus/streaming/PTInputStream.java
+++ b/commons-db/src/main/java/com/palantir/nexus/streaming/PTInputStream.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.nexus.streaming;
 
+import com.palantir.common.io.ForwardingInputStream;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 
-import com.palantir.common.io.ForwardingInputStream;
-
 public class PTInputStream extends ForwardingInputStream implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/commons-db/src/main/java/com/palantir/sql/Blobs.java b/commons-db/src/main/java/com/palantir/sql/Blobs.java
index b79cace8a61..fb37b9a5b03 100644
--- a/commons-db/src/main/java/com/palantir/sql/Blobs.java
+++ b/commons-db/src/main/java/com/palantir/sql/Blobs.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.sql;
 
-import java.sql.Blob;
-import java.sql.SQLException;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.BasicSQL;
+import java.sql.Blob;
+import java.sql.SQLException;
 
 public class Blobs {
     public static long length(Blob b) throws PalantirSqlException {
diff --git a/commons-db/src/main/java/com/palantir/sql/Clobs.java b/commons-db/src/main/java/com/palantir/sql/Clobs.java
index b72a4039ef8..64dd363b398 100644
--- a/commons-db/src/main/java/com/palantir/sql/Clobs.java
+++ b/commons-db/src/main/java/com/palantir/sql/Clobs.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.sql;
 
-import java.sql.Clob;
-import java.sql.SQLException;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.BasicSQL;
+import java.sql.Clob;
+import java.sql.SQLException;
 
 public class Clobs {
 
diff --git a/commons-db/src/main/java/com/palantir/sql/Connections.java b/commons-db/src/main/java/com/palantir/sql/Connections.java
index efb80a5ef17..d16c99afe29 100644
--- a/commons-db/src/main/java/com/palantir/sql/Connections.java
+++ b/commons-db/src/main/java/com/palantir/sql/Connections.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.sql;
 
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.sql.BasicSQL;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.sql.BasicSQL;
-
 
 public class Connections  {
 
diff --git a/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java b/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java
index 9812caa5157..58461397d60 100644
--- a/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java
+++ b/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java
@@ -15,15 +15,14 @@
  */
 package com.palantir.sql;
 
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.sql.BasicSQL;
 import java.io.InputStream;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.sql.BasicSQL;
-
 public class PreparedStatements {
     public static int getUpdateCount(PreparedStatement ps) throws PalantirSqlException {
         try {
diff --git a/commons-db/src/main/java/com/palantir/sql/ResultSets.java b/commons-db/src/main/java/com/palantir/sql/ResultSets.java
index 1f7a809175f..28c03e3f990 100644
--- a/commons-db/src/main/java/com/palantir/sql/ResultSets.java
+++ b/commons-db/src/main/java/com/palantir/sql/ResultSets.java
@@ -15,6 +15,10 @@
  */
 package com.palantir.sql;
 
+import com.google.common.collect.Maps;
+import com.palantir.exception.PalantirSqlException;
+import com.palantir.nexus.db.DBType;
+import com.palantir.nexus.db.sql.BasicSQL;
 import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -26,11 +30,6 @@
 import java.sql.Timestamp;
 import java.util.Map;
 
-import com.google.common.collect.Maps;
-import com.palantir.exception.PalantirSqlException;
-import com.palantir.nexus.db.DBType;
-import com.palantir.nexus.db.sql.BasicSQL;
-
 public class ResultSets {
 
     public static Object getObject(ResultSet rs, int col) throws PalantirSqlException {
diff --git a/commons-db/src/test/java/com/palantir/nexus/db/ThreadConfinedProxyTest.java b/commons-db/src/test/java/com/palantir/nexus/db/ThreadConfinedProxyTest.java
index 911d815859b..a81089e1192 100644
--- a/commons-db/src/test/java/com/palantir/nexus/db/ThreadConfinedProxyTest.java
+++ b/commons-db/src/test/java/com/palantir/nexus/db/ThreadConfinedProxyTest.java
@@ -19,6 +19,9 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.google.common.collect.Iterables;
+import com.palantir.common.proxy.TimingProxy;
+import com.palantir.util.timer.LoggingOperationTimer;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,15 +31,10 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Iterables;
-import com.palantir.common.proxy.TimingProxy;
-import com.palantir.util.timer.LoggingOperationTimer;
-
 public class ThreadConfinedProxyTest {
 
     Logger log = LoggerFactory.getLogger(ThreadConfinedProxyTest.class);
@@ -423,4 +421,3 @@ public List<String> subList(int fromIndex, int toIndex) {
 
     }
 }
-
diff --git a/commons-db/src/test/java/com/palantir/nexus/db/sql/BasicSQLTest.java b/commons-db/src/test/java/com/palantir/nexus/db/sql/BasicSQLTest.java
index 0bde7f08b48..18382d711e5 100644
--- a/commons-db/src/test/java/com/palantir/nexus/db/sql/BasicSQLTest.java
+++ b/commons-db/src/test/java/com/palantir/nexus/db/sql/BasicSQLTest.java
@@ -21,18 +21,16 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.palantir.nexus.db.monitoring.timer.DurationSqlTimer;
+import com.palantir.nexus.db.monitoring.timer.SqlTimer;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
-
 import org.junit.Test;
 
-import com.palantir.nexus.db.monitoring.timer.DurationSqlTimer;
-import com.palantir.nexus.db.monitoring.timer.SqlTimer;
-
 @SuppressWarnings("unchecked") // mocked executors
 public class BasicSQLTest {
     @Test
diff --git a/commons-db/src/test/java/com/palantir/nexus/db/sql/SQLStringTest.java b/commons-db/src/test/java/com/palantir/nexus/db/sql/SQLStringTest.java
index 22f0d031108..f2d09330ff2 100644
--- a/commons-db/src/test/java/com/palantir/nexus/db/sql/SQLStringTest.java
+++ b/commons-db/src/test/java/com/palantir/nexus/db/sql/SQLStringTest.java
@@ -17,12 +17,10 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-
 public class SQLStringTest {
     @Test
     public void testCanonicalizeString() {
diff --git a/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java b/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java
index bcdf6220628..e2ca0825eba 100644
--- a/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java
+++ b/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java
@@ -15,6 +15,12 @@
  */
 package com.palantir.common.concurrent;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+import com.google.common.util.concurrent.Runnables;
+import com.palantir.tracing.Tracers;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,17 +42,9 @@
 import java.util.concurrent.ThreadPoolExecutor.AbortPolicy;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.util.concurrent.Runnables;
-import com.palantir.tracing.Tracers;
-
 /**
  * Please always use the static methods in this class instead of the ones in {@link
  * Executors}, because the executors returned by these methods will propagate
diff --git a/commons-executors/src/test/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocalTest.java b/commons-executors/src/test/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocalTest.java
index d4e700f7be7..e82f4ebd113 100644
--- a/commons-executors/src/test/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocalTest.java
+++ b/commons-executors/src/test/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocalTest.java
@@ -18,24 +18,22 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Callables;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.Callables;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-
 public class ExecutorInheritableThreadLocalTest {
     private static final String orig = "Yo";
     private static List<Integer> outputList = Lists.newLinkedList();
diff --git a/commons-executors/src/test/java/com/palantir/common/concurrent/PTExecutorsTest.java b/commons-executors/src/test/java/com/palantir/common/concurrent/PTExecutorsTest.java
index edad0909d00..edff434ae65 100644
--- a/commons-executors/src/test/java/com/palantir/common/concurrent/PTExecutorsTest.java
+++ b/commons-executors/src/test/java/com/palantir/common/concurrent/PTExecutorsTest.java
@@ -18,18 +18,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.SettableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
 import org.junit.Test;
 
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.SettableFuture;
-
 @SuppressWarnings("checkstyle:AbbreviationAsWordInName") // Name matches the class we're testing
 public class PTExecutorsTest {
 
diff --git a/commons-proxy/src/main/java/com/palantir/proxy/exception/ProxyException.java b/commons-proxy/src/main/java/com/palantir/proxy/exception/ProxyException.java
index 57da260d808..e5754443d88 100644
--- a/commons-proxy/src/main/java/com/palantir/proxy/exception/ProxyException.java
+++ b/commons-proxy/src/main/java/com/palantir/proxy/exception/ProxyException.java
@@ -30,4 +30,3 @@ public ProxyException(String message, Throwable cause) {
         super(message, cause);
     }
 }
-
diff --git a/commons-proxy/src/main/java/com/palantir/proxy/util/ProxyUtils.java b/commons-proxy/src/main/java/com/palantir/proxy/util/ProxyUtils.java
index 89fe0015616..bafa580c306 100644
--- a/commons-proxy/src/main/java/com/palantir/proxy/util/ProxyUtils.java
+++ b/commons-proxy/src/main/java/com/palantir/proxy/util/ProxyUtils.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.proxy.util;
 
+import com.palantir.proxy.exception.ProxyException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -25,8 +26,6 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import com.palantir.proxy.exception.ProxyException;
-
 public final class ProxyUtils {
     private ProxyUtils() {
         // Utility class, should never be instantiated
diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/ProfileStore.java b/examples/profile-client/src/main/java/com/palantir/example/profile/ProfileStore.java
index 4d3f314fe20..12d875cbb49 100644
--- a/examples/profile-client/src/main/java/com/palantir/example/profile/ProfileStore.java
+++ b/examples/profile-client/src/main/java/com/palantir/example/profile/ProfileStore.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.example.profile;
 
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.ptobject.EncodingUtils;
@@ -37,6 +31,11 @@
 import com.palantir.example.profile.schema.generated.UserProfileTable.UserBirthdaysIdxTable.UserBirthdaysIdxRow;
 import com.palantir.example.profile.schema.generated.UserProfileTable.UserProfileRow;
 import com.palantir.util.crypto.Sha256Hash;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 public class ProfileStore {
     final TransactionManager txnMgr;
diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/ProfileSchema.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/ProfileSchema.java
index 2a753e171c3..e6b8a8f3b9e 100644
--- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/ProfileSchema.java
+++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/ProfileSchema.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.example.profile.schema;
 
-import java.io.File;
-import java.util.List;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
@@ -33,6 +30,8 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.example.profile.protos.generated.ProfilePersistence;
+import java.io.File;
+import java.util.List;
 
 @SuppressWarnings({"checkstyle:Indentation", "checkstyle:RightCurly"})
 public class ProfileSchema implements AtlasSchema {
diff --git a/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java b/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java
index e161ec6e1f5..6f374e8b03c 100644
--- a/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java
+++ b/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.example.profile;
 
+import com.palantir.example.profile.schema.generated.UserProfileTable.CookiesIdxTable.CookiesIdxColumn;
 import java.util.UUID;
-
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.palantir.example.profile.schema.generated.UserProfileTable.CookiesIdxTable.CookiesIdxColumn;
-
 public class CookiesIdxColumnTest {
     @Test
     public void testHashCode() {
diff --git a/examples/profile-client/src/test/java/com/palantir/example/profile/ProfileStoreTest.java b/examples/profile-client/src/test/java/com/palantir/example/profile/ProfileStoreTest.java
index 7fc879db9ea..01419dd46bf 100644
--- a/examples/profile-client/src/test/java/com/palantir/example/profile/ProfileStoreTest.java
+++ b/examples/profile-client/src/test/java/com/palantir/example/profile/ProfileStoreTest.java
@@ -18,19 +18,6 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Function;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Closeables;
 import com.palantir.atlasdb.factory.TransactionManagers;
@@ -43,6 +30,17 @@
 import com.palantir.example.profile.schema.generated.ProfileTableFactory;
 import com.palantir.example.profile.schema.generated.UserPhotosStreamValueTable;
 import com.palantir.util.crypto.Sha256Hash;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Function;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class ProfileStoreTest {
     private static final byte[] IMAGE = new byte[] {0, 1, 2, 3};
diff --git a/examples/profile-client/src/test/java/com/palantir/example/profile/WritesDigestTest.java b/examples/profile-client/src/test/java/com/palantir/example/profile/WritesDigestTest.java
index 765f8bb5a2e..3bce7ca1f65 100644
--- a/examples/profile-client/src/test/java/com/palantir/example/profile/WritesDigestTest.java
+++ b/examples/profile-client/src/test/java/com/palantir/example/profile/WritesDigestTest.java
@@ -18,14 +18,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.BaseEncoding;
@@ -45,6 +37,12 @@
 import com.palantir.example.profile.schema.generated.UserProfileTable.PhotoStreamId;
 import com.palantir.example.profile.schema.generated.UserProfileTable.UserProfileRow;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import org.junit.Before;
+import org.junit.Test;
 
 public class WritesDigestTest {
 
diff --git a/flake-rule/src/main/java/com/palantir/flake/FlakeRetryingRule.java b/flake-rule/src/main/java/com/palantir/flake/FlakeRetryingRule.java
index 5bc5b526c52..d11a4de80e0 100644
--- a/flake-rule/src/main/java/com/palantir/flake/FlakeRetryingRule.java
+++ b/flake-rule/src/main/java/com/palantir/flake/FlakeRetryingRule.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.flake;
 
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
 import java.util.Arrays;
 import java.util.Optional;
-
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
-
 /**
  * A {@link TestRule} that retries methods and classes annotated with the {@link ShouldRetry} annotation.
  *
diff --git a/flake-rule/src/test/java/com/palantir/flake/BeforeClassFlakeTest.java b/flake-rule/src/test/java/com/palantir/flake/BeforeClassFlakeTest.java
index 043b2d204b1..37d1a7db38f 100644
--- a/flake-rule/src/test/java/com/palantir/flake/BeforeClassFlakeTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/BeforeClassFlakeTest.java
@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
diff --git a/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleClassAnnotationTest.java b/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleClassAnnotationTest.java
index 6a7ee38dcae..0596d4b0e6c 100644
--- a/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleClassAnnotationTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleClassAnnotationTest.java
@@ -17,15 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
 
-import com.google.common.collect.Maps;
-
 @ShouldRetry(numAttempts = 2)
 public class FlakeRetryingRuleClassAnnotationTest {
     private static final Map<String, AtomicLong> counters = Maps.newHashMap();
diff --git a/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleTest.java b/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleTest.java
index d3f35e178be..e971dd75d8e 100644
--- a/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/FlakeRetryingRuleTest.java
@@ -17,18 +17,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.Maps;
+import com.palantir.flake.fail.ExpectedFailure;
+import com.palantir.flake.fail.ExpectedFailureRule;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestName;
 
-import com.google.common.collect.Maps;
-import com.palantir.flake.fail.ExpectedFailure;
-import com.palantir.flake.fail.ExpectedFailureRule;
-
 public class FlakeRetryingRuleTest {
     private static final Map<String, AtomicLong> counters = Maps.newHashMap();
 
diff --git a/flake-rule/src/test/java/com/palantir/flake/example/BeforeAndAfterTest.java b/flake-rule/src/test/java/com/palantir/flake/example/BeforeAndAfterTest.java
index 8176a6bdef2..dd62b746347 100644
--- a/flake-rule/src/test/java/com/palantir/flake/example/BeforeAndAfterTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/example/BeforeAndAfterTest.java
@@ -21,8 +21,9 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import com.palantir.flake.FlakeRetryingRule;
+import com.palantir.flake.ShouldRetry;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -31,9 +32,6 @@
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
-import com.palantir.flake.FlakeRetryingRule;
-import com.palantir.flake.ShouldRetry;
-
 public class BeforeAndAfterTest {
     private static final AtomicInteger attemptCount = new AtomicInteger();
     private static final int SEVENTY_SEVEN = 77;
diff --git a/flake-rule/src/test/java/com/palantir/flake/example/StringSupplierTest.java b/flake-rule/src/test/java/com/palantir/flake/example/StringSupplierTest.java
index 266b4496a9e..d2c26de3fff 100644
--- a/flake-rule/src/test/java/com/palantir/flake/example/StringSupplierTest.java
+++ b/flake-rule/src/test/java/com/palantir/flake/example/StringSupplierTest.java
@@ -17,15 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.flake.FlakeRetryingRule;
+import com.palantir.flake.ShouldRetry;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Supplier;
-
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.palantir.flake.FlakeRetryingRule;
-import com.palantir.flake.ShouldRetry;
-
 public class StringSupplierTest {
     private static final String TEST_STRING = "123";
     private static final String EMPTY_STRING = "";
diff --git a/leader-election-api/src/main/java/com/palantir/leader/LeaderElectionService.java b/leader-election-api/src/main/java/com/palantir/leader/LeaderElectionService.java
index 559a4f6569f..ab6710c4ea5 100644
--- a/leader-election-api/src/main/java/com/palantir/leader/LeaderElectionService.java
+++ b/leader-election-api/src/main/java/com/palantir/leader/LeaderElectionService.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.leader;
 
-import java.io.Serializable;
-import java.util.Optional;
-
 import com.google.common.net.HostAndPort;
 import com.palantir.atlasdb.metrics.Timed;
+import java.io.Serializable;
+import java.util.Optional;
 
 public interface LeaderElectionService {
     interface LeadershipToken extends Serializable {
diff --git a/leader-election-api/src/main/java/com/palantir/leader/PingableLeader.java b/leader-election-api/src/main/java/com/palantir/leader/PingableLeader.java
index d4ad1800509..f689d5eb1b0 100644
--- a/leader-election-api/src/main/java/com/palantir/leader/PingableLeader.java
+++ b/leader-election-api/src/main/java/com/palantir/leader/PingableLeader.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.leader;
 
+import com.palantir.atlasdb.metrics.Timed;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.atlasdb.metrics.Timed;
-
 @Path("/leader")
 public interface PingableLeader {
 
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/BooleanPaxosResponse.java b/leader-election-api/src/main/java/com/palantir/paxos/BooleanPaxosResponse.java
index c0322271ca3..85bc9b274fd 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/BooleanPaxosResponse.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/BooleanPaxosResponse.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.paxos;
 
-import java.util.Objects;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.common.annotation.Immutable;
+import java.util.Objects;
 
 @Immutable
 public class BooleanPaxosResponse implements PaxosResponse {
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosAcceptor.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosAcceptor.java
index 8d82a7b80d5..002461778e9 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosAcceptor.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosAcceptor.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.paxos;
 
+import com.palantir.atlasdb.metrics.Timed;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -22,8 +23,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.atlasdb.metrics.Timed;
-
 @Path("/acceptor")
 public interface PaxosAcceptor {
     long NO_LOG_ENTRY = -1L;
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosLearner.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosLearner.java
index e4410446c5f..138410702c8 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosLearner.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosLearner.java
@@ -15,9 +15,10 @@
  */
 package com.palantir.paxos;
 
+import com.palantir.atlasdb.metrics.Timed;
+import com.palantir.common.annotation.Inclusive;
 import java.util.Collection;
 import java.util.Optional;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -26,9 +27,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.atlasdb.metrics.Timed;
-import com.palantir.common.annotation.Inclusive;
-
 @Path("/learner")
 public interface PaxosLearner {
 
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromise.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromise.java
index 282b14c2d72..5b50161af33 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromise.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromise.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.paxos;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.builder.CompareToBuilder;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.common.annotation.Immutable;
 import com.palantir.logsafe.Preconditions;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 
 /**
  * A promise to not accept new proposals less than promisedID.
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromises.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromises.java
index 5c8e4386441..239b82bf38f 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromises.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosPromises.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.paxos;
 
-import javax.annotation.Nullable;
-
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence.PaxosPromiseProto;
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence.PaxosPromiseProto.Builder;
+import javax.annotation.Nullable;
 
 public final class PaxosPromises {
     private PaxosPromises() {
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposal.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposal.java
index e386b81572f..4e83c514461 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposal.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposal.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.paxos;
 
-import java.io.Serializable;
-
-import javax.annotation.Nonnull;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.common.annotation.Immutable;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence;
+import java.io.Serializable;
+import javax.annotation.Nonnull;
 
 /**
  * A proposal of a value that needs quorum support.
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposalId.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposalId.java
index 37f5592e71b..c951e76b5d2 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposalId.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposalId.java
@@ -15,16 +15,13 @@
  */
 package com.palantir.paxos;
 
-import java.io.Serializable;
-
-import javax.annotation.Nonnull;
-
-import org.apache.commons.lang3.builder.CompareToBuilder;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.common.annotation.Immutable;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.paxos.persistence.generated.PaxosPersistence;
+import java.io.Serializable;
+import javax.annotation.Nonnull;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 
 /**
  * Proposal identifiers that establish a strict ordering.
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposer.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposer.java
index 068e22173e5..b8243c6a9c4 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposer.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosProposer.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.paxos;
 
-import javax.annotation.Nullable;
-
 import com.palantir.atlasdb.metrics.Timed;
+import javax.annotation.Nullable;
 
 public interface PaxosProposer {
 
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosResponse.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosResponse.java
index 88729ff8dfd..e91ff829c46 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosResponse.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosResponse.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.paxos;
 
-import java.io.Serializable;
-
 import com.palantir.common.annotation.Immutable;
+import java.io.Serializable;
 
 @Immutable
 public interface PaxosResponse extends Serializable {
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosStateLog.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosStateLog.java
index 8409a14b08e..a655943e073 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosStateLog.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosStateLog.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.paxos;
 
-import java.io.IOException;
-
 import com.palantir.common.persist.Persistable;
+import java.io.IOException;
 
 public interface PaxosStateLog<V extends Persistable & Versionable> {
 
diff --git a/leader-election-api/src/main/java/com/palantir/paxos/PaxosValue.java b/leader-election-api/src/main/java/com/palantir/paxos/PaxosValue.java
index 2e65f90593e..c0599451098 100644
--- a/leader-election-api/src/main/java/com/palantir/paxos/PaxosValue.java
+++ b/leader-election-api/src/main/java/com/palantir/paxos/PaxosValue.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.paxos;
 
-import java.io.Serializable;
-import java.util.Arrays;
-
-import javax.annotation.Nullable;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Defaults;
@@ -31,6 +26,9 @@
 import com.palantir.common.persist.Persistable;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.paxos.persistence.generated.PaxosPersistence;
+import java.io.Serializable;
+import java.util.Arrays;
+import javax.annotation.Nullable;
 
 @Immutable
 public class PaxosValue implements Persistable, Versionable, Serializable {
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/BatchingLeaderElectionService.java b/leader-election-impl/src/main/java/com/palantir/leader/BatchingLeaderElectionService.java
index 5c4635d360f..2b67957f514 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/BatchingLeaderElectionService.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/BatchingLeaderElectionService.java
@@ -16,15 +16,14 @@
 
 package com.palantir.leader;
 
-import java.io.Closeable;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-
 import com.google.common.net.HostAndPort;
 import com.palantir.atlasdb.autobatch.Autobatchers;
 import com.palantir.atlasdb.autobatch.BatchElement;
 import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
+import java.io.Closeable;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 
 public class BatchingLeaderElectionService implements LeaderElectionService, Closeable {
     private final LeaderElectionService delegate;
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/LeaderElectionServiceBuilder.java b/leader-election-impl/src/main/java/com/palantir/leader/LeaderElectionServiceBuilder.java
index 118c4f95352..f8643d435f8 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/LeaderElectionServiceBuilder.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/LeaderElectionServiceBuilder.java
@@ -16,12 +16,6 @@
 
 package com.palantir.leader;
 
-import java.time.Duration;
-import java.util.UUID;
-import java.util.function.UnaryOperator;
-
-import javax.annotation.Nullable;
-
 import com.palantir.logsafe.Preconditions;
 import com.palantir.paxos.LeaderPinger;
 import com.palantir.paxos.PaxosAcceptorNetworkClient;
@@ -29,6 +23,10 @@
 import com.palantir.paxos.PaxosLearnerNetworkClient;
 import com.palantir.paxos.PaxosProposer;
 import com.palantir.paxos.PaxosProposerImpl;
+import java.time.Duration;
+import java.util.UUID;
+import java.util.function.UnaryOperator;
+import javax.annotation.Nullable;
 
 @SuppressWarnings({"HiddenField", "OverloadMethodsDeclarationOrder"})
 public final class LeaderElectionServiceBuilder {
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/LeadershipEvents.java b/leader-election-impl/src/main/java/com/palantir/leader/LeadershipEvents.java
index 50e23ae84d4..33adb52d29f 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/LeadershipEvents.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/LeadershipEvents.java
@@ -15,20 +15,17 @@
  */
 package com.palantir.leader;
 
-import java.util.List;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Meter;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.paxos.PaxosRoundFailureException;
 import com.palantir.paxos.PaxosValue;
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
-
+import java.util.List;
 import net.jcip.annotations.ThreadSafe;
+import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @ThreadSafe
 class LeadershipEvents {
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/LocalPingableLeader.java b/leader-election-impl/src/main/java/com/palantir/leader/LocalPingableLeader.java
index 189932b2fbb..00adb10dbe5 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/LocalPingableLeader.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/LocalPingableLeader.java
@@ -16,10 +16,9 @@
 
 package com.palantir.leader;
 
-import java.util.UUID;
-
 import com.palantir.paxos.PaxosLearner;
 import com.palantir.paxos.PaxosValue;
+import java.util.UUID;
 
 public final class LocalPingableLeader implements PingableLeader {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java
index 1d9a4fa726b..a11b0635b5c 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.leader;
 
-import java.time.Duration;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.collect.ImmutableCollection;
@@ -45,6 +35,14 @@
 import com.palantir.paxos.PaxosRoundFailureException;
 import com.palantir.paxos.PaxosUpdate;
 import com.palantir.paxos.PaxosValue;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of a paxos member than can be a designated proposer (leader) and designated
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipEventRecorder.java b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipEventRecorder.java
index 2408e2ce1ee..31beb60d439 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipEventRecorder.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipEventRecorder.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.leader;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.paxos.PaxosRoundFailureException;
 import com.palantir.paxos.PaxosValue;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
 
 public class PaxosLeadershipEventRecorder implements PaxosKnowledgeEventRecorder, PaxosLeaderElectionEventRecorder {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipToken.java b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipToken.java
index 0b0c43c90d6..bc8a459e89e 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipToken.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeadershipToken.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.leader;
 
-import org.apache.commons.lang3.builder.CompareToBuilder;
-
 import com.palantir.common.annotation.Immutable;
 import com.palantir.leader.LeaderElectionService.LeadershipToken;
 import com.palantir.paxos.PaxosValue;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 
 @Immutable
 public class PaxosLeadershipToken implements LeadershipToken {
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java b/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java
index 60d6de61a41..a299cabefc9 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/proxy/AwaitingLeadershipProxy.java
@@ -15,6 +15,18 @@
  */
 package com.palantir.leader.proxy;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.reflect.AbstractInvocationHandler;
+import com.google.common.util.concurrent.Uninterruptibles;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.common.remoting.ServiceNotAvailableException;
+import com.palantir.leader.LeaderElectionService;
+import com.palantir.leader.LeaderElectionService.LeadershipToken;
+import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
+import com.palantir.leader.NotCurrentLeaderException;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.io.Closeable;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -27,25 +39,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
-
 import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.google.common.util.concurrent.Uninterruptibles;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.common.remoting.ServiceNotAvailableException;
-import com.palantir.leader.LeaderElectionService;
-import com.palantir.leader.LeaderElectionService.LeadershipToken;
-import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
-import com.palantir.leader.NotCurrentLeaderException;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 public final class AwaitingLeadershipProxy<T> extends AbstractInvocationHandler {
 
     private static final Logger log = LoggerFactory.getLogger(AwaitingLeadershipProxy.class);
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/InProgressResponseState.java b/leader-election-impl/src/main/java/com/palantir/paxos/InProgressResponseState.java
index 267e524ca9f..3111740ffff 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/InProgressResponseState.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/InProgressResponseState.java
@@ -17,7 +17,6 @@
 package com.palantir.paxos;
 
 import java.util.Map;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/LeaderPingResult.java b/leader-election-impl/src/main/java/com/palantir/paxos/LeaderPingResult.java
index 68d042f4dea..bf9f676d65f 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/LeaderPingResult.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/LeaderPingResult.java
@@ -16,16 +16,14 @@
 
 package com.palantir.paxos;
 
+import com.google.common.net.HostAndPort;
+import com.palantir.leader.PaxosLeaderElectionEventRecorder;
 import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
-
 import org.derive4j.Data;
 
-import com.google.common.net.HostAndPort;
-import com.palantir.leader.PaxosLeaderElectionEventRecorder;
-
 @Data
 public abstract class LeaderPingResult {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/LeaderPingerContext.java b/leader-election-impl/src/main/java/com/palantir/paxos/LeaderPingerContext.java
index cbda89f1a8a..101ffb2c73f 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/LeaderPingerContext.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/LeaderPingerContext.java
@@ -16,9 +16,8 @@
 
 package com.palantir.paxos;
 
-import org.immutables.value.Value;
-
 import com.google.common.net.HostAndPort;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(allParameters = true)
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosAcceptorImpl.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosAcceptorImpl.java
index 0d15e5919a5..6d4a1f967ec 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosAcceptorImpl.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosAcceptorImpl.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.paxos;
 
+import com.palantir.logsafe.SafeArg;
 import java.io.IOException;
 import java.util.concurrent.ConcurrentSkipListMap;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.logsafe.SafeArg;
-
 public final class PaxosAcceptorImpl implements PaxosAcceptor {
     private static final Logger logger = LoggerFactory.getLogger(PaxosAcceptorImpl.class);
 
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosLearnerImpl.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosLearnerImpl.java
index fd0c4d96f8e..0a662f07b50 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosLearnerImpl.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosLearnerImpl.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.leader.PaxosKnowledgeEventRecorder;
+import com.palantir.logsafe.SafeArg;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Optional;
@@ -22,14 +25,9 @@
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.leader.PaxosKnowledgeEventRecorder;
-import com.palantir.logsafe.SafeArg;
-
 public final class PaxosLearnerImpl implements PaxosLearner {
 
     private static final Logger logger = LoggerFactory.getLogger(PaxosLearnerImpl.class);
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosProposerImpl.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosProposerImpl.java
index ba884c62481..fcf6830af53 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosProposerImpl.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosProposerImpl.java
@@ -18,7 +18,6 @@
 import java.util.Collections;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
-
 import javax.annotation.Nullable;
 
 /**
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosQuorumChecker.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosQuorumChecker.java
index 0ba0ffe2592..8fb415ff5db 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosQuorumChecker.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosQuorumChecker.java
@@ -15,6 +15,15 @@
  */
 package com.palantir.paxos;
 
+import com.codahale.metrics.Meter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.palantir.common.concurrent.MultiplexingCompletionService;
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.logsafe.Preconditions;
+import com.palantir.logsafe.SafeArg;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
@@ -28,20 +37,9 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.codahale.metrics.Meter;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.palantir.common.concurrent.MultiplexingCompletionService;
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.logsafe.Preconditions;
-import com.palantir.logsafe.SafeArg;
-
 @SuppressWarnings("MethodTypeParameterName")
 public final class PaxosQuorumChecker {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponseAccumulator.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponseAccumulator.java
index 8ac39e7e32e..81f9535ebba 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponseAccumulator.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponseAccumulator.java
@@ -16,14 +16,12 @@
 
 package com.palantir.paxos;
 
+import com.palantir.logsafe.Preconditions;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Predicate;
-
 import javax.annotation.concurrent.NotThreadSafe;
 
-import com.palantir.logsafe.Preconditions;
-
 @NotThreadSafe
 final class PaxosResponseAccumulator<S, T extends PaxosResponse> {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponses.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponses.java
index f522cd1ff4d..a08a254523e 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponses.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponses.java
@@ -20,7 +20,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponsesWithRemote.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponsesWithRemote.java
index a41ec324ffa..46bc581bbad 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponsesWithRemote.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosResponsesWithRemote.java
@@ -16,14 +16,12 @@
 
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.common.streams.KeyedStream;
 import java.util.Map;
 import java.util.function.Function;
-
 import org.immutables.value.Value;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.common.streams.KeyedStream;
-
 @Value.Immutable
 public abstract class PaxosResponsesWithRemote<S, T extends PaxosResponse> {
 
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosStateLogImpl.java b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosStateLogImpl.java
index e796ad25194..7e929e6f1b0 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/PaxosStateLogImpl.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/PaxosStateLogImpl.java
@@ -15,6 +15,19 @@
  */
 package com.palantir.paxos;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.CodedInputStream;
+import com.google.protobuf.CodedOutputStream;
+import com.palantir.common.base.Throwables;
+import com.palantir.common.persist.Persistable;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
+import com.palantir.paxos.persistence.generated.PaxosPersistence;
+import com.palantir.util.crypto.Sha256Hash;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -28,26 +41,11 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.concurrent.locks.ReentrantLock;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.CodedInputStream;
-import com.google.protobuf.CodedOutputStream;
-import com.palantir.common.base.Throwables;
-import com.palantir.common.persist.Persistable;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-import com.palantir.paxos.persistence.generated.PaxosPersistence;
-import com.palantir.util.crypto.Sha256Hash;
-
 public class PaxosStateLogImpl<V extends Persistable & Versionable> implements PaxosStateLog<V> {
 
     private final ReentrantLock lock = new ReentrantLock();
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderAcceptorNetworkClient.java b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderAcceptorNetworkClient.java
index fe257e00b3a..4421f4dcacd 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderAcceptorNetworkClient.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderAcceptorNetworkClient.java
@@ -16,12 +16,11 @@
 
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
-import com.google.common.collect.ImmutableList;
-
 public class SingleLeaderAcceptorNetworkClient implements PaxosAcceptorNetworkClient {
 
     private final ImmutableList<PaxosAcceptor> acceptors;
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderLearnerNetworkClient.java b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderLearnerNetworkClient.java
index 0515a8a6dd4..ea98720629c 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderLearnerNetworkClient.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderLearnerNetworkClient.java
@@ -16,20 +16,18 @@
 
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.BaseEncoding;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.logsafe.UnsafeArg;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.io.BaseEncoding;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.logsafe.UnsafeArg;
-
 public class SingleLeaderLearnerNetworkClient implements PaxosLearnerNetworkClient {
 
     private static final Logger log = LoggerFactory.getLogger(SingleLeaderLearnerNetworkClient.class);
diff --git a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderPinger.java b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderPinger.java
index 9dcf3860e98..8bfe1880bdb 100644
--- a/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderPinger.java
+++ b/leader-election-impl/src/main/java/com/palantir/paxos/SingleLeaderPinger.java
@@ -16,6 +16,13 @@
 
 package com.palantir.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.Futures;
+import com.palantir.common.base.Throwables;
+import com.palantir.common.concurrent.MultiplexingCompletionService;
+import com.palantir.leader.PingableLeader;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
@@ -25,20 +32,10 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.Futures;
-import com.palantir.common.base.Throwables;
-import com.palantir.common.concurrent.MultiplexingCompletionService;
-import com.palantir.leader.PingableLeader;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 public class SingleLeaderPinger implements LeaderPinger {
 
     private static final Logger log = LoggerFactory.getLogger(SingleLeaderPinger.class);
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/LeadershipEventRecorderTest.java b/leader-election-impl/src/test/java/com/palantir/leader/LeadershipEventRecorderTest.java
index b6376da2501..672447dfae1 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/LeadershipEventRecorderTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/LeadershipEventRecorderTest.java
@@ -20,14 +20,12 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import com.palantir.paxos.PaxosRoundFailureException;
+import com.palantir.paxos.PaxosValue;
 import java.util.Optional;
-
 import org.junit.After;
 import org.junit.Test;
 
-import com.palantir.paxos.PaxosRoundFailureException;
-import com.palantir.paxos.PaxosValue;
-
 public class LeadershipEventRecorderTest {
 
     private static final String LEADER_ID = "foo";
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/PaxosLeaderEventsTest.java b/leader-election-impl/src/test/java/com/palantir/leader/PaxosLeaderEventsTest.java
index 45b044dc0ed..943823951a8 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/PaxosLeaderEventsTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/PaxosLeaderEventsTest.java
@@ -18,24 +18,22 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.net.HostAndPort;
+import com.palantir.paxos.ImmutableLeaderPingerContext;
+import com.palantir.paxos.LeaderPingResults;
+import com.palantir.paxos.LeaderPinger;
+import com.palantir.paxos.SingleLeaderPinger;
 import java.time.Duration;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.net.HostAndPort;
-import com.palantir.paxos.ImmutableLeaderPingerContext;
-import com.palantir.paxos.LeaderPingResults;
-import com.palantir.paxos.LeaderPinger;
-import com.palantir.paxos.SingleLeaderPinger;
-
 @RunWith(MockitoJUnitRunner.class)
 public class PaxosLeaderEventsTest {
 
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java b/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java
index 191458c6e70..cffa8b960f0 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/proxy/AwaitingLeadershipProxyTest.java
@@ -25,6 +25,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.base.Suppliers;
+import com.google.common.util.concurrent.Uninterruptibles;
+import com.palantir.leader.LeaderElectionService;
+import com.palantir.leader.NotCurrentLeaderException;
+import com.palantir.leader.PaxosLeadershipToken;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -34,16 +39,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
 import java.util.function.Supplier;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Suppliers;
-import com.google.common.util.concurrent.Uninterruptibles;
-import com.palantir.leader.LeaderElectionService;
-import com.palantir.leader.NotCurrentLeaderException;
-import com.palantir.leader.PaxosLeadershipToken;
-
 public class AwaitingLeadershipProxyTest {
     private static final String TEST_MESSAGE = "test_message";
 
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/proxy/SimulatingFailingServerProxy.java b/leader-election-impl/src/test/java/com/palantir/leader/proxy/SimulatingFailingServerProxy.java
index a1dd2c225a7..b8476977e9e 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/proxy/SimulatingFailingServerProxy.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/proxy/SimulatingFailingServerProxy.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.leader.proxy;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import com.palantir.common.proxy.SimulatingServerProxy;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public final class SimulatingFailingServerProxy {
 
diff --git a/leader-election-impl/src/test/java/com/palantir/leader/proxy/ToggleableExceptionProxy.java b/leader-election-impl/src/test/java/com/palantir/leader/proxy/ToggleableExceptionProxy.java
index e2521190119..35bab8efbde 100644
--- a/leader-election-impl/src/test/java/com/palantir/leader/proxy/ToggleableExceptionProxy.java
+++ b/leader-election-impl/src/test/java/com/palantir/leader/proxy/ToggleableExceptionProxy.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.leader.proxy;
 
+import com.palantir.common.base.Throwables;
+import com.palantir.common.proxy.DelegatingInvocationHandler;
+import com.palantir.logsafe.Preconditions;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.palantir.common.base.Throwables;
-import com.palantir.common.proxy.DelegatingInvocationHandler;
-import com.palantir.logsafe.Preconditions;
-
 public final class ToggleableExceptionProxy implements DelegatingInvocationHandler {
 
     @SuppressWarnings("unchecked")
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/AllLeaderElectionTests.java b/leader-election-impl/src/test/java/com/palantir/paxos/AllLeaderElectionTests.java
index 2dcd495b0f0..fbae1f2c24b 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/AllLeaderElectionTests.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/AllLeaderElectionTests.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.paxos;
 
+import com.palantir.paxos.persistence.ProtobufTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import com.palantir.paxos.persistence.ProtobufTest;
-
 @RunWith(Suite.class)
 @SuiteClasses({ProtobufTest.class, PaxosConsensusFastTest.class, PaxosConsensusSlowTest.class})
 public class AllLeaderElectionTests {}
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusFastTest.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusFastTest.java
index daedacf5929..0cd0a7ccf49 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusFastTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusFastTest.java
@@ -23,6 +23,10 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.common.proxy.DelegatingInvocationHandler;
+import com.palantir.leader.LeaderElectionService.LeadershipToken;
+import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Proxy;
@@ -32,17 +36,11 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.common.proxy.DelegatingInvocationHandler;
-import com.palantir.leader.LeaderElectionService.LeadershipToken;
-import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
-
 public class PaxosConsensusFastTest {
     private PaxosTestState state;
 
@@ -284,4 +282,3 @@ private void restoreAllNodes() {
         }
     }
 }
-
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusSlowTest.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusSlowTest.java
index e5f6bc0cfc0..ad163a029a1 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusSlowTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusSlowTest.java
@@ -18,17 +18,15 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
+import com.palantir.common.concurrent.PTExecutors;
 import java.util.concurrent.CompletionService;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.common.concurrent.PTExecutors;
-
 public class PaxosConsensusSlowTest {
 
     Executor executor = PTExecutors.newCachedThreadPool();
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusTestUtils.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusTestUtils.java
index de7d1308f5f..82c133125bf 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusTestUtils.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosConsensusTestUtils.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.paxos;
 
-import java.io.File;
-import java.time.Duration;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.commons.io.FileUtils;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -36,6 +26,14 @@
 import com.palantir.leader.proxy.ToggleableExceptionProxy;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import java.io.File;
+import java.time.Duration;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.io.FileUtils;
 
 public final class PaxosConsensusTestUtils {
 
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosLatestRoundVerifierTest.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosLatestRoundVerifierTest.java
index 05ed8cf56b4..7e6b60084be 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosLatestRoundVerifierTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosLatestRoundVerifierTest.java
@@ -22,7 +22,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.junit.Test;
 
 // TODO(nziebart): these tests are mostly sanity checks, until we have better tests for {@link PaxosQuorumChecker}.
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosTestState.java b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosTestState.java
index 7eb6ebe913e..19b9eecbfb8 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/PaxosTestState.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/PaxosTestState.java
@@ -17,16 +17,14 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.palantir.leader.LeaderElectionService;
+import com.palantir.leader.LeaderElectionService.LeadershipToken;
+import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.assertj.core.api.Assertions;
 
-import com.palantir.leader.LeaderElectionService;
-import com.palantir.leader.LeaderElectionService.LeadershipToken;
-import com.palantir.leader.LeaderElectionService.StillLeadingStatus;
-
 public class PaxosTestState {
     private final List<LeaderElectionService> leaders;
     private final List<PaxosLearner> learners;
diff --git a/leader-election-impl/src/test/java/com/palantir/paxos/persistence/ProtobufTest.java b/leader-election-impl/src/test/java/com/palantir/paxos/persistence/ProtobufTest.java
index 808587645d1..2654c453878 100644
--- a/leader-election-impl/src/test/java/com/palantir/paxos/persistence/ProtobufTest.java
+++ b/leader-election-impl/src/test/java/com/palantir/paxos/persistence/ProtobufTest.java
@@ -17,8 +17,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
-
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosPromises;
 import com.palantir.paxos.PaxosProposal;
@@ -29,6 +27,7 @@
 import com.palantir.paxos.persistence.generated.PaxosPersistence;
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence;
 import com.palantir.paxos.persistence.generated.remoting.PaxosAcceptorPersistence.PaxosPromiseProto;
+import org.junit.Test;
 
 public class ProtobufTest {
     @Test
diff --git a/lock-api/src/main/java/com/palantir/lock/AtlasCellLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/AtlasCellLockDescriptor.java
index 6830cd1bd4b..0e63d10d7aa 100644
--- a/lock-api/src/main/java/com/palantir/lock/AtlasCellLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/AtlasCellLockDescriptor.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.google.common.base.Strings;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/AtlasRowLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/AtlasRowLockDescriptor.java
index b3ab08524a0..b8bdbdf7e98 100644
--- a/lock-api/src/main/java/com/palantir/lock/AtlasRowLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/AtlasRowLockDescriptor.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.google.common.base.Strings;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/AtlasTimestampLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/AtlasTimestampLockDescriptor.java
index a62e0f606df..38c4bd51b90 100644
--- a/lock-api/src/main/java/com/palantir/lock/AtlasTimestampLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/AtlasTimestampLockDescriptor.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.google.common.primitives.Longs;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/ByteArrayLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/ByteArrayLockDescriptor.java
index a38cba510e2..7bd22c878ba 100644
--- a/lock-api/src/main/java/com/palantir/lock/ByteArrayLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/ByteArrayLockDescriptor.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/ExpiringToken.java b/lock-api/src/main/java/com/palantir/lock/ExpiringToken.java
index 088299f161a..15ff374ad0a 100644
--- a/lock-api/src/main/java/com/palantir/lock/ExpiringToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/ExpiringToken.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock;
 
+import com.google.common.primitives.Longs;
 import java.util.Comparator;
-
 import javax.annotation.Nullable;
 
-import com.google.common.primitives.Longs;
-
 /**
  * A lock server token with an expiration date.
  *
diff --git a/lock-api/src/main/java/com/palantir/lock/ForwardingRemoteLockService.java b/lock-api/src/main/java/com/palantir/lock/ForwardingRemoteLockService.java
index 7b81116ba14..9731c5d245d 100644
--- a/lock-api/src/main/java/com/palantir/lock/ForwardingRemoteLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/ForwardingRemoteLockService.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.lock;
 
+import com.google.common.collect.ForwardingObject;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Set;
 
-import com.google.common.collect.ForwardingObject;
-
 public abstract class ForwardingRemoteLockService extends ForwardingObject implements CloseableRemoteLockService {
 
     @Override
diff --git a/lock-api/src/main/java/com/palantir/lock/HeldLocksGrant.java b/lock-api/src/main/java/com/palantir/lock/HeldLocksGrant.java
index 123b6292ad0..7b78eb3af0b 100644
--- a/lock-api/src/main/java/com/palantir/lock/HeldLocksGrant.java
+++ b/lock-api/src/main/java/com/palantir/lock/HeldLocksGrant.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -36,6 +25,15 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A grant for a set of locks which are currently held by the lock server. Lock
diff --git a/lock-api/src/main/java/com/palantir/lock/HeldLocksToken.java b/lock-api/src/main/java/com/palantir/lock/HeldLocksToken.java
index 46c388f9738..d3fc8df6a80 100644
--- a/lock-api/src/main/java/com/palantir/lock/HeldLocksToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/HeldLocksToken.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -36,6 +25,15 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A token representing a set of locks being held by a client and the
diff --git a/lock-api/src/main/java/com/palantir/lock/HeldLocksTokens.java b/lock-api/src/main/java/com/palantir/lock/HeldLocksTokens.java
index 1053255957e..daced544f25 100644
--- a/lock-api/src/main/java/com/palantir/lock/HeldLocksTokens.java
+++ b/lock-api/src/main/java/com/palantir/lock/HeldLocksTokens.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.lock;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
+import javax.annotation.Nullable;
 
 public final class HeldLocksTokens {
     private HeldLocksTokens() {/**/}
diff --git a/lock-api/src/main/java/com/palantir/lock/LockClient.java b/lock-api/src/main/java/com/palantir/lock/LockClient.java
index 8ad59f490da..c60c098ff98 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockClient.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A client of the lock server. Clients who desire reentrancy are required to
diff --git a/lock-api/src/main/java/com/palantir/lock/LockCollection.java b/lock-api/src/main/java/com/palantir/lock/LockCollection.java
index e36a2a4210a..bd5ae62d5b6 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockCollection.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockCollection.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.lock;
 
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import java.io.Serializable;
 import java.util.AbstractCollection;
 import java.util.Arrays;
@@ -26,10 +29,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
 /**
  * Replacement for when you would normally use Map&lt;T, LockMode&gt;,
  * but don't actually need the keys to be a set, or to have random
diff --git a/lock-api/src/main/java/com/palantir/lock/LockCollections.java b/lock-api/src/main/java/com/palantir/lock/LockCollections.java
index 328557077e4..742b08c0a75 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockCollections.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockCollections.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.lock;
 
-import java.util.Comparator;
-import java.util.Map;
-import java.util.SortedMap;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
 import com.palantir.logsafe.Preconditions;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.SortedMap;
 
 public final class LockCollections {
 
diff --git a/lock-api/src/main/java/com/palantir/lock/LockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/LockDescriptor.java
index d76e4cc3b2f..ae33c284a99 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockDescriptor.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.concurrent.locks.ReadWriteLock;
-
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -28,6 +22,10 @@
 import com.google.common.base.Charsets;
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.UnsignedBytes;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.concurrent.locks.ReadWriteLock;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A descriptor for a {@link ReadWriteLock}.
diff --git a/lock-api/src/main/java/com/palantir/lock/LockRefreshToken.java b/lock-api/src/main/java/com/palantir/lock/LockRefreshToken.java
index 03831957db3..340d0ed8375 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockRefreshToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockRefreshToken.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.lock;
 
-import java.io.Serializable;
-import java.math.BigInteger;
-
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.logsafe.Preconditions;
+import java.io.Serializable;
+import java.math.BigInteger;
+import javax.annotation.concurrent.Immutable;
 
 @Immutable
 public final class LockRefreshToken implements Serializable {
diff --git a/lock-api/src/main/java/com/palantir/lock/LockRequest.java b/lock-api/src/main/java/com/palantir/lock/LockRequest.java
index ce1c7a957de..26330249eb4 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockRequest.java
@@ -15,19 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.NotThreadSafe;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -39,6 +26,17 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.annotation.concurrent.NotThreadSafe;
 
 /**
  * An encapsulation of all parameters needed to make a locking request to the
diff --git a/lock-api/src/main/java/com/palantir/lock/LockResponse.java b/lock-api/src/main/java/com/palantir/lock/LockResponse.java
index cb42de939f0..2eb67aa19f0 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockResponse.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -33,6 +23,14 @@
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableSortedMap;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * Represents the result of calling {@link LockService#lockWithFullLockResponse(LockClient, LockRequest)} on
diff --git a/lock-api/src/main/java/com/palantir/lock/LockRpcClient.java b/lock-api/src/main/java/com/palantir/lock/LockRpcClient.java
index 9d77113ccb0..643c21c01e3 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockRpcClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockRpcClient.java
@@ -16,10 +16,11 @@
 
 package com.palantir.lock;
 
+import com.palantir.annotations.remoting.CancelableServerCall;
+import com.palantir.logsafe.Safe;
 import java.math.BigInteger;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -27,9 +28,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.annotations.remoting.CancelableServerCall;
-import com.palantir.logsafe.Safe;
-
 @Path("/{namespace}/lock")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/lock-api/src/main/java/com/palantir/lock/LockServerOptions.java b/lock-api/src/main/java/com/palantir/lock/LockServerOptions.java
index 528eedd9ecd..8fa92c93e8d 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockServerOptions.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockServerOptions.java
@@ -15,21 +15,18 @@
  */
 package com.palantir.lock;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.concurrent.TimeUnit;
-
 import javax.annotation.Nullable;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
 /**
  * Provides the set of options which can be passed to the
  * lock server upon construction.
diff --git a/lock-api/src/main/java/com/palantir/lock/LockService.java b/lock-api/src/main/java/com/palantir/lock/LockService.java
index b81aceb0214..a5db306b7a1 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockService.java
@@ -15,9 +15,14 @@
  */
 package com.palantir.lock;
 
+import com.google.common.annotations.Beta;
+import com.palantir.annotations.remoting.CancelableServerCall;
+import com.palantir.common.annotation.Idempotent;
+import com.palantir.common.annotation.NonIdempotent;
+import com.palantir.logsafe.Safe;
+import com.palantir.processors.AutoDelegate;
 import java.math.BigInteger;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -26,13 +31,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.annotations.Beta;
-import com.palantir.annotations.remoting.CancelableServerCall;
-import com.palantir.common.annotation.Idempotent;
-import com.palantir.common.annotation.NonIdempotent;
-import com.palantir.logsafe.Safe;
-import com.palantir.processors.AutoDelegate;
-
 /**
  * Defines the service which handles locking operations.
  *
diff --git a/lock-api/src/main/java/com/palantir/lock/LockWithClient.java b/lock-api/src/main/java/com/palantir/lock/LockWithClient.java
index f60f43ad540..af8787e4638 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockWithClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockWithClient.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockWithClient.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/LockWithMode.java b/lock-api/src/main/java/com/palantir/lock/LockWithMode.java
index 84c7704eee5..d3163fb2101 100644
--- a/lock-api/src/main/java/com/palantir/lock/LockWithMode.java
+++ b/lock-api/src/main/java/com/palantir/lock/LockWithMode.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.lock;
 
-import java.util.Objects;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
 
 public class LockWithMode {
     private LockDescriptor lockDescriptor;
diff --git a/lock-api/src/main/java/com/palantir/lock/NamespaceAgnosticLockRpcClient.java b/lock-api/src/main/java/com/palantir/lock/NamespaceAgnosticLockRpcClient.java
index 189349a4f3d..59ead7ad773 100644
--- a/lock-api/src/main/java/com/palantir/lock/NamespaceAgnosticLockRpcClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/NamespaceAgnosticLockRpcClient.java
@@ -16,10 +16,11 @@
 
 package com.palantir.lock;
 
+import com.palantir.annotations.remoting.CancelableServerCall;
+import com.palantir.logsafe.Safe;
 import java.math.BigInteger;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -27,9 +28,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.annotations.remoting.CancelableServerCall;
-import com.palantir.logsafe.Safe;
-
 /**
  * See also {@link LockRpcClient}. This interface exists to support legacy users not using an external TimeLock
  * server (as in these cases, lock services will not be namespaced) but also using remoting frameworks where
diff --git a/lock-api/src/main/java/com/palantir/lock/RemoteLockService.java b/lock-api/src/main/java/com/palantir/lock/RemoteLockService.java
index a2f7275f841..bfbe023d8d5 100644
--- a/lock-api/src/main/java/com/palantir/lock/RemoteLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/RemoteLockService.java
@@ -15,8 +15,10 @@
  */
 package com.palantir.lock;
 
+import com.palantir.common.annotation.Idempotent;
+import com.palantir.common.annotation.NonIdempotent;
+import com.palantir.logsafe.Safe;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -25,10 +27,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.common.annotation.Idempotent;
-import com.palantir.common.annotation.NonIdempotent;
-import com.palantir.logsafe.Safe;
-
 public interface RemoteLockService {
     /**
      * Attempts to acquire the requested set of locks for the given client.
diff --git a/lock-api/src/main/java/com/palantir/lock/SimpleHeldLocksToken.java b/lock-api/src/main/java/com/palantir/lock/SimpleHeldLocksToken.java
index 04329a43a49..e5edf4012c9 100644
--- a/lock-api/src/main/java/com/palantir/lock/SimpleHeldLocksToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/SimpleHeldLocksToken.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.lock;
 
-import java.io.Serializable;
-import java.math.BigInteger;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.logsafe.Preconditions;
+import java.io.Serializable;
+import java.math.BigInteger;
 
 public class SimpleHeldLocksToken implements Serializable {
     private static final long serialVersionUID = 1L;
diff --git a/lock-api/src/main/java/com/palantir/lock/SimpleTimeDuration.java b/lock-api/src/main/java/com/palantir/lock/SimpleTimeDuration.java
index d3bbe01f94b..e4180e2475f 100644
--- a/lock-api/src/main/java/com/palantir/lock/SimpleTimeDuration.java
+++ b/lock-api/src/main/java/com/palantir/lock/SimpleTimeDuration.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.lock;
 
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.primitives.Longs;
 import com.palantir.logsafe.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A simple, immutable implementation of {@link TimeDuration}.
diff --git a/lock-api/src/main/java/com/palantir/lock/SimplifyingLockService.java b/lock-api/src/main/java/com/palantir/lock/SimplifyingLockService.java
index a99b05e73b4..e4be0ca3aaf 100644
--- a/lock-api/src/main/java/com/palantir/lock/SimplifyingLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/SimplifyingLockService.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.lock;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import java.util.Map;
+import java.util.Set;
 
 public abstract class SimplifyingLockService implements AutoDelegate_LockService, CloseableLockService {
 
diff --git a/lock-api/src/main/java/com/palantir/lock/SortedLockCollection.java b/lock-api/src/main/java/com/palantir/lock/SortedLockCollection.java
index fc5df8e0705..228f6ebf70d 100644
--- a/lock-api/src/main/java/com/palantir/lock/SortedLockCollection.java
+++ b/lock-api/src/main/java/com/palantir/lock/SortedLockCollection.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.lock;
 
+import com.google.common.collect.Iterables;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import com.google.common.collect.Iterables;
-
 /**
  * Replacement for when you would normally use SortedMap&lt;T, LockMode&gt;,
  * but don't actually need the keys to be a set, or to have random
diff --git a/lock-api/src/main/java/com/palantir/lock/StringLockDescriptor.java b/lock-api/src/main/java/com/palantir/lock/StringLockDescriptor.java
index 793d5a65f61..1ecf8f0c560 100644
--- a/lock-api/src/main/java/com/palantir/lock/StringLockDescriptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/StringLockDescriptor.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.lock;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import com.google.common.base.Charsets;
 import com.google.common.base.Strings;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * A descriptor for a {@link ReadWriteLock}, identified by a lock ID (a unique
diff --git a/lock-api/src/main/java/com/palantir/lock/TimeDuration.java b/lock-api/src/main/java/com/palantir/lock/TimeDuration.java
index 47b9a3e1323..44825e1d0a2 100644
--- a/lock-api/src/main/java/com/palantir/lock/TimeDuration.java
+++ b/lock-api/src/main/java/com/palantir/lock/TimeDuration.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.concurrent.TimeUnit;
-
 import javax.annotation.Nullable;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
 /**
  * A container class to encapsulate a {@link TimeUnit} with a {@code long}
  * duration.
diff --git a/lock-api/src/main/java/com/palantir/lock/TimelockNamespace.java b/lock-api/src/main/java/com/palantir/lock/TimelockNamespace.java
index 5164cc4f3bf..ee6303d9a6a 100644
--- a/lock-api/src/main/java/com/palantir/lock/TimelockNamespace.java
+++ b/lock-api/src/main/java/com/palantir/lock/TimelockNamespace.java
@@ -16,11 +16,10 @@
 
 package com.palantir.lock;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableTimelockNamespace.class)
 @JsonDeserialize(as = ImmutableTimelockNamespace.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/client/AsyncTimeLockUnlocker.java b/lock-api/src/main/java/com/palantir/lock/client/AsyncTimeLockUnlocker.java
index 6e2be0cea1d..67915bbb8c3 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/AsyncTimeLockUnlocker.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/AsyncTimeLockUnlocker.java
@@ -15,19 +15,17 @@
  */
 package com.palantir.lock.client;
 
-import java.util.Collection;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.autobatch.Autobatchers;
 import com.palantir.atlasdb.autobatch.BatchElement;
 import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.logsafe.SafeArg;
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Releases lock tokens from a {@link TimelockService} asynchronously.
diff --git a/lock-api/src/main/java/com/palantir/lock/client/IdentifiedLockRequest.java b/lock-api/src/main/java/com/palantir/lock/client/IdentifiedLockRequest.java
index ca3f8c8537f..d90ab7f2fbd 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/IdentifiedLockRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/IdentifiedLockRequest.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.lock.client;
 
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockRequest;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableIdentifiedLockRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LeasedLockToken.java b/lock-api/src/main/java/com/palantir/lock/client/LeasedLockToken.java
index 34256d752c9..5e3d5708498 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LeasedLockToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LeasedLockToken.java
@@ -16,15 +16,13 @@
 
 package com.palantir.lock.client;
 
-import java.util.UUID;
-
-import javax.annotation.concurrent.GuardedBy;
-
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.Lease;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.util.UUID;
+import javax.annotation.concurrent.GuardedBy;
 
 final class LeasedLockToken implements LockToken {
     private final LockToken serverToken;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockLeaseService.java b/lock-api/src/main/java/com/palantir/lock/client/LockLeaseService.java
index 9011d2cf061..e535e44d044 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockLeaseService.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockLeaseService.java
@@ -16,10 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Sets;
 import com.palantir.common.concurrent.CoalescingSupplier;
@@ -38,6 +34,9 @@
 import com.palantir.lock.v2.StartTransactionRequestV4;
 import com.palantir.lock.v2.StartTransactionResponseV4;
 import com.palantir.logsafe.Preconditions;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 class LockLeaseService {
     private final NamespacedTimelockRpcClient delegate;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockRefresher.java b/lock-api/src/main/java/com/palantir/lock/client/LockRefresher.java
index 4b9962b28bd..012ccbc4554 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockRefresher.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockRefresher.java
@@ -15,22 +15,20 @@
  */
 package com.palantir.lock.client;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+import com.palantir.lock.v2.LockToken;
+import com.palantir.lock.v2.TimelockService;
+import com.palantir.logsafe.SafeArg;
 import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-import com.palantir.lock.v2.LockToken;
-import com.palantir.lock.v2.TimelockService;
-import com.palantir.logsafe.SafeArg;
-
 public class LockRefresher implements AutoCloseable {
 
     private final Logger log = LoggerFactory.getLogger(LockRefresher.class);
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingLockService.java b/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingLockService.java
index 3a837493ed8..3ebd71cc443 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingLockService.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.lock.client;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -38,6 +28,14 @@
 import com.palantir.lock.SimpleHeldLocksToken;
 import com.palantir.lock.SimplifyingLockService;
 import com.palantir.logsafe.Preconditions;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class LockRefreshingLockService extends SimplifyingLockService {
     public static final int REFRESH_BATCH_SIZE = 500_000;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingRemoteLockService.java b/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingRemoteLockService.java
index 725362aad9b..5833eab73b1 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingRemoteLockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockRefreshingRemoteLockService.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.lock.client;
 
-import java.io.IOException;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.lock.ForwardingRemoteLockService;
@@ -31,6 +22,13 @@
 import com.palantir.lock.LockRefreshToken;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.RemoteLockService;
+import java.io.IOException;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("checkstyle:FinalClass") // Avoid breaking API in case someone extended this
 public class LockRefreshingRemoteLockService extends ForwardingRemoteLockService {
diff --git a/lock-api/src/main/java/com/palantir/lock/client/LockTokenShare.java b/lock-api/src/main/java/com/palantir/lock/client/LockTokenShare.java
index 7dc92c061f9..d724a989456 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/LockTokenShare.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/LockTokenShare.java
@@ -16,14 +16,13 @@
 
 package com.palantir.lock.client;
 
+import com.palantir.lock.v2.LockToken;
+import com.palantir.logsafe.Preconditions;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.palantir.lock.v2.LockToken;
-import com.palantir.logsafe.Preconditions;
-
 final class LockTokenShare implements LockToken {
     private final UUID requestId;
     private final LockToken sharedLockToken;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/NamespaceAgnosticLockClientAdaptor.java b/lock-api/src/main/java/com/palantir/lock/client/NamespaceAgnosticLockClientAdaptor.java
index e2df404eb58..6f3be14641c 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/NamespaceAgnosticLockClientAdaptor.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/NamespaceAgnosticLockClientAdaptor.java
@@ -16,10 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.math.BigInteger;
-import java.util.Optional;
-import java.util.Set;
-
 import com.palantir.lock.HeldLocksGrant;
 import com.palantir.lock.HeldLocksToken;
 import com.palantir.lock.LockClient;
@@ -30,6 +26,9 @@
 import com.palantir.lock.LockServerOptions;
 import com.palantir.lock.NamespaceAgnosticLockRpcClient;
 import com.palantir.lock.SimpleHeldLocksToken;
+import java.math.BigInteger;
+import java.util.Optional;
+import java.util.Set;
 
 public class NamespaceAgnosticLockClientAdaptor implements NamespaceAgnosticLockRpcClient {
     private final String namespace;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/ProfilingTimelockService.java b/lock-api/src/main/java/com/palantir/lock/client/ProfilingTimelockService.java
index 26ecfb26211..95ac02fad31 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/ProfilingTimelockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/ProfilingTimelockService.java
@@ -16,17 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.time.Duration;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.RateLimiter;
@@ -42,6 +31,15 @@
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.timestamp.TimestampRange;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Logs operations on an underlying {@link TimelockService} that take a long time (defined as longer than
diff --git a/lock-api/src/main/java/com/palantir/lock/client/RemoteLockServiceAdapter.java b/lock-api/src/main/java/com/palantir/lock/client/RemoteLockServiceAdapter.java
index 113dabf498e..7edc412c036 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/RemoteLockServiceAdapter.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/RemoteLockServiceAdapter.java
@@ -16,11 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.math.BigInteger;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
 import com.palantir.lock.HeldLocksGrant;
 import com.palantir.lock.HeldLocksToken;
 import com.palantir.lock.LockClient;
@@ -32,6 +27,9 @@
 import com.palantir.lock.LockService;
 import com.palantir.lock.NamespaceAgnosticLockRpcClient;
 import com.palantir.lock.SimpleHeldLocksToken;
+import java.math.BigInteger;
+import java.util.Set;
+import javax.annotation.Nullable;
 
 public class RemoteLockServiceAdapter implements LockService {
     private final NamespaceAgnosticLockRpcClient namespaceAgnosticLockRpcClient;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/RemoteTimelockServiceAdapter.java b/lock-api/src/main/java/com/palantir/lock/client/RemoteTimelockServiceAdapter.java
index 1f7016d6ce6..9876f3b19fe 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/RemoteTimelockServiceAdapter.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/RemoteTimelockServiceAdapter.java
@@ -16,8 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.util.Set;
-
 import com.palantir.lock.v2.LockImmutableTimestampResponse;
 import com.palantir.lock.v2.LockRequest;
 import com.palantir.lock.v2.LockResponse;
@@ -29,6 +27,7 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.timestamp.TimestampRange;
+import java.util.Set;
 
 public final class RemoteTimelockServiceAdapter implements TimelockService, AutoCloseable {
     private final NamespacedTimelockRpcClient rpcClient;
diff --git a/lock-api/src/main/java/com/palantir/lock/client/TimeLockClient.java b/lock-api/src/main/java/com/palantir/lock/client/TimeLockClient.java
index 96a6c82e3a4..bc429be2b5b 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/TimeLockClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/TimeLockClient.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.lock.client;
 
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ScheduledExecutorService;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.palantir.common.base.Throwables;
@@ -37,6 +31,11 @@
 import com.palantir.timestamp.CloseableTimestampService;
 import com.palantir.timestamp.RequestBatchingTimestampService;
 import com.palantir.timestamp.TimestampRange;
+import java.net.ConnectException;
+import java.net.UnknownHostException;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ScheduledExecutorService;
 
 public class TimeLockClient implements AutoCloseable, TimelockService {
 
diff --git a/lock-api/src/main/java/com/palantir/lock/client/TimeLockUnlocker.java b/lock-api/src/main/java/com/palantir/lock/client/TimeLockUnlocker.java
index 94e8fa6160a..1da694614f9 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/TimeLockUnlocker.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/TimeLockUnlocker.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.lock.client;
 
+import com.palantir.lock.v2.LockToken;
 import java.io.Closeable;
 import java.util.Set;
 
-import com.palantir.lock.v2.LockToken;
-
 public interface TimeLockUnlocker extends Closeable {
     void enqueue(Set<LockToken> tokens);
 
diff --git a/lock-api/src/main/java/com/palantir/lock/client/TransactionStarter.java b/lock-api/src/main/java/com/palantir/lock/client/TransactionStarter.java
index c1a3a3e6e23..c567e9abd12 100644
--- a/lock-api/src/main/java/com/palantir/lock/client/TransactionStarter.java
+++ b/lock-api/src/main/java/com/palantir/lock/client/TransactionStarter.java
@@ -16,15 +16,6 @@
 
 package com.palantir.lock.client;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
@@ -39,6 +30,14 @@
 import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse;
 import com.palantir.lock.v2.StartTransactionResponseV4;
 import com.palantir.lock.v2.TimestampAndPartition;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * A service responsible for coalescing multiple start transaction calls into a single start transactions call. This
diff --git a/lock-api/src/main/java/com/palantir/lock/package-info.java b/lock-api/src/main/java/com/palantir/lock/package-info.java
index e8c845640f9..bfb618842e3 100644
--- a/lock-api/src/main/java/com/palantir/lock/package-info.java
+++ b/lock-api/src/main/java/com/palantir/lock/package-info.java
@@ -17,5 +17,3 @@
 package com.palantir.lock;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-
-
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/IdentifiedTimeLockRequest.java b/lock-api/src/main/java/com/palantir/lock/v2/IdentifiedTimeLockRequest.java
index 74b1bfba24a..ded74aebce2 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/IdentifiedTimeLockRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/IdentifiedTimeLockRequest.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableIdentifiedTimeLockRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LeaderTime.java b/lock-api/src/main/java/com/palantir/lock/v2/LeaderTime.java
index 36ffd966b15..0c04214d28c 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LeaderTime.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LeaderTime.java
@@ -16,11 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.common.time.NanoTime;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLeaderTime.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LeadershipId.java b/lock-api/src/main/java/com/palantir/lock/v2/LeadershipId.java
index e1079681a6b..d9189e65879 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LeadershipId.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LeadershipId.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/Lease.java b/lock-api/src/main/java/com/palantir/lock/v2/Lease.java
index 974846455b4..54f4133c94d 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/Lease.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/Lease.java
@@ -16,13 +16,11 @@
 
 package com.palantir.lock.v2;
 
-import java.time.Duration;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.common.time.NanoTime;
+import java.time.Duration;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLease.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockImmutableTimestampResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/LockImmutableTimestampResponse.java
index a41b7cf00c9..9d1c1174714 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockImmutableTimestampResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockImmutableTimestampResponse.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockImmutableTimestampResponse.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockRequest.java b/lock-api/src/main/java/com/palantir/lock/v2/LockRequest.java
index d5be82ccabf..4a0c739cbd9 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockRequest.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.Optional;
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.LockDescriptor;
+import java.util.Optional;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/LockResponse.java
index 7b5642b486d..fdf8892f18b 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockResponse.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockResponse.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockResponseV2.java b/lock-api/src/main/java/com/palantir/lock/v2/LockResponseV2.java
index f7535a0e075..0761518b419 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockResponseV2.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockResponseV2.java
@@ -16,15 +16,13 @@
 
 package com.palantir.lock.v2;
 
-import java.util.function.Function;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.function.Function;
+import org.immutables.value.Value;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/LockToken.java b/lock-api/src/main/java/com/palantir/lock/v2/LockToken.java
index 5bfe515522d..a031c57fb3e 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/LockToken.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/LockToken.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockToken.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/NamespacedTimelockRpcClient.java b/lock-api/src/main/java/com/palantir/lock/v2/NamespacedTimelockRpcClient.java
index ec199934539..4f19034dda0 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/NamespacedTimelockRpcClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/NamespacedTimelockRpcClient.java
@@ -16,12 +16,11 @@
 
 package com.palantir.lock.v2;
 
-import java.util.OptionalLong;
-import java.util.Set;
-
 import com.palantir.lock.client.IdentifiedLockRequest;
 import com.palantir.lock.watch.TimestampWithWatches;
 import com.palantir.timestamp.TimestampRange;
+import java.util.OptionalLong;
+import java.util.Set;
 
 /**
  * Adapter that mirrors {@code TimelockRpcClient}, but for convenience automatically provides the namespace as a
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/PartitionedTimestamps.java b/lock-api/src/main/java/com/palantir/lock/v2/PartitionedTimestamps.java
index 768f51d65c5..4b1bc91f776 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/PartitionedTimestamps.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/PartitionedTimestamps.java
@@ -16,14 +16,12 @@
 
 package com.palantir.lock.v2;
 
-import java.util.stream.LongStream;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.primitives.Ints;
+import java.util.stream.LongStream;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutablePartitionedTimestamps.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/RefreshLockResponseV2.java b/lock-api/src/main/java/com/palantir/lock/v2/RefreshLockResponseV2.java
index 4518262d74b..1040729d18b 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/RefreshLockResponseV2.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/RefreshLockResponseV2.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableRefreshLockResponseV2.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponse.java
index eb6eec7bb6b..3ff4e13ba49 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponse.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartAtlasDbTransactionResponse.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponseV3.java b/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponseV3.java
index ebadbe0aa65..b456bb93dc9 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponseV3.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartAtlasDbTransactionResponseV3.java
@@ -16,11 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartAtlasDbTransactionResponseV3.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionRequest.java b/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionRequest.java
index ce6a008d986..46134d1d9ac 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionRequest.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartIdentifiedAtlasDbTransactionRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionResponse.java
index 678a9789224..a284a4770ae 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartIdentifiedAtlasDbTransactionResponse.java
@@ -16,10 +16,9 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartIdentifiedAtlasDbTransactionResponse.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV4.java b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV4.java
index be62567b7fc..6ca944d6b1d 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV4.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV4.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartTransactionRequestV4.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV5.java b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV5.java
index df6f1441e15..5725a75b653 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV5.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionRequestV5.java
@@ -16,14 +16,12 @@
 
 package com.palantir.lock.v2;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.util.OptionalLong;
 import java.util.UUID;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartTransactionRequestV5.class)
 @JsonDeserialize(as = ImmutableStartTransactionRequestV5.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV4.java b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV4.java
index 3cb974e5a66..10bf836c938 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV4.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV4.java
@@ -16,10 +16,9 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableStartTransactionResponseV4.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV5.java b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV5.java
index 8f9939fb7fd..b19b5d21da1 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV5.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionResponseV5.java
@@ -16,11 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.watch.LockWatchStateUpdate;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionWithWatchesResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionWithWatchesResponse.java
index 686f58821a5..da97843d625 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionWithWatchesResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/StartTransactionWithWatchesResponse.java
@@ -16,11 +16,10 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.watch.LockWatchStateUpdate;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/TimelockRpcClient.java b/lock-api/src/main/java/com/palantir/lock/v2/TimelockRpcClient.java
index 3c35d46b32e..a295e28d365 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/TimelockRpcClient.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/TimelockRpcClient.java
@@ -16,9 +16,13 @@
 
 package com.palantir.lock.v2;
 
+import com.palantir.lock.client.IdentifiedLockRequest;
+import com.palantir.lock.watch.TimestampWithWatches;
+import com.palantir.logsafe.Safe;
+import com.palantir.processors.AutoDelegate;
+import com.palantir.timestamp.TimestampRange;
 import java.util.OptionalLong;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -28,12 +32,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.lock.client.IdentifiedLockRequest;
-import com.palantir.lock.watch.TimestampWithWatches;
-import com.palantir.logsafe.Safe;
-import com.palantir.processors.AutoDelegate;
-import com.palantir.timestamp.TimestampRange;
-
 /**
  * Interface describing timelock endpoints to be used by feign client factories to create raw clients.
  *
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/TimelockService.java b/lock-api/src/main/java/com/palantir/lock/v2/TimelockService.java
index 0a3a06d0d3c..cdffa46bc7d 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/TimelockService.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/TimelockService.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.lock.v2;
 
-import java.util.Set;
-
-import javax.ws.rs.QueryParam;
-
 import com.palantir.logsafe.Safe;
 import com.palantir.processors.AutoDelegate;
 import com.palantir.processors.DoNotDelegate;
 import com.palantir.timestamp.TimestampRange;
+import java.util.Set;
+import javax.ws.rs.QueryParam;
 
 @AutoDelegate
 public interface TimelockService {
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/TimestampAndPartition.java b/lock-api/src/main/java/com/palantir/lock/v2/TimestampAndPartition.java
index 3e98c5677d1..23c3eccb885 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/TimestampAndPartition.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/TimestampAndPartition.java
@@ -16,10 +16,9 @@
 
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 /**
  * A pair of a timestamp along with a numeric partition identifier that may be used by some Atlas clients operating
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksRequest.java b/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksRequest.java
index fd32a308fa9..f36e80bf226 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksRequest.java
@@ -15,18 +15,15 @@
  */
 package com.palantir.lock.v2;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.palantir.lock.LockDescriptor;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-
 import javax.annotation.Nullable;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.palantir.lock.LockDescriptor;
-
 @Value.Immutable
 @JsonSerialize(as = ImmutableWaitForLocksRequest.class)
 @JsonDeserialize(as = ImmutableWaitForLocksRequest.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksResponse.java b/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksResponse.java
index 949080f14c7..39617b76058 100644
--- a/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/v2/WaitForLocksResponse.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.lock.v2;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableWaitForLocksResponse.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/LockEvent.java b/lock-api/src/main/java/com/palantir/lock/watch/LockEvent.java
index a3eabc7ce62..9f322837937 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/LockEvent.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/LockEvent.java
@@ -16,15 +16,13 @@
 
 package com.palantir.lock.watch;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockToken;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchCreatedEvent.java b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchCreatedEvent.java
index c9b91c56164..c37d4f92db4 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchCreatedEvent.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchCreatedEvent.java
@@ -16,13 +16,11 @@
 
 package com.palantir.lock.watch;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchInfo.java b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchInfo.java
index 6ae9e1f0f34..cc755279f5f 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchInfo.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchInfo.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.watch;
 
-import java.util.OptionalLong;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.OptionalLong;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableLockWatchInfo.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchOpenLocksEvent.java b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchOpenLocksEvent.java
index 17df288f156..5ba204c14b3 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchOpenLocksEvent.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchOpenLocksEvent.java
@@ -16,15 +16,13 @@
 
 package com.palantir.lock.watch;
 
-import java.util.Set;
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.LockDescriptor;
+import java.util.Set;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchReferences.java b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchReferences.java
index 87666ec61d7..7920d789792 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchReferences.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchReferences.java
@@ -16,8 +16,6 @@
 
 package com.palantir.lock.watch;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -26,6 +24,7 @@
 import com.google.common.collect.Range;
 import com.palantir.lock.AtlasLockDescriptorRanges;
 import com.palantir.lock.LockDescriptor;
+import org.immutables.value.Value;
 
 public final class LockWatchReferences {
     public static final LockDescriptorRangeVisitor TO_RANGES_VISITOR = new LockDescriptorRangeVisitor();
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchRequest.java b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchRequest.java
index 08df50d30aa..a82935971b0 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchRequest.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchRequest.java
@@ -16,12 +16,10 @@
 
 package com.palantir.lock.watch;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchStateUpdate.java b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchStateUpdate.java
index b51a79c4a8f..8b61a5f8c13 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/LockWatchStateUpdate.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/LockWatchStateUpdate.java
@@ -16,16 +16,14 @@
 
 package com.palantir.lock.watch;
 
-import java.util.List;
-import java.util.OptionalLong;
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.collect.ImmutableList;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import java.util.OptionalLong;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/TimestampWithWatches.java b/lock-api/src/main/java/com/palantir/lock/watch/TimestampWithWatches.java
index c9751617cd1..5aaae5a1cdf 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/TimestampWithWatches.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/TimestampWithWatches.java
@@ -16,10 +16,9 @@
 
 package com.palantir.lock.watch;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableTimestampWithWatches.class)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/TimestampedLockResponse.java b/lock-api/src/main/java/com/palantir/lock/watch/TimestampedLockResponse.java
index 642508add63..f6a27a23e26 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/TimestampedLockResponse.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/TimestampedLockResponse.java
@@ -16,13 +16,11 @@
 
 package com.palantir.lock.watch;
 
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.v2.LockResponse;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/UnlockEvent.java b/lock-api/src/main/java/com/palantir/lock/watch/UnlockEvent.java
index 9848687d32d..f2c93926f89 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/UnlockEvent.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/UnlockEvent.java
@@ -16,14 +16,12 @@
 
 package com.palantir.lock.watch;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.lock.LockDescriptor;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PACKAGE)
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/VersionedLockWatchState.java b/lock-api/src/main/java/com/palantir/lock/watch/VersionedLockWatchState.java
index b0b8093f2d6..97beefea0e1 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/VersionedLockWatchState.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/VersionedLockWatchState.java
@@ -16,11 +16,10 @@
 
 package com.palantir.lock.watch;
 
-import java.util.OptionalLong;
-import java.util.UUID;
-
 import com.palantir.common.annotation.Idempotent;
 import com.palantir.lock.LockDescriptor;
+import java.util.OptionalLong;
+import java.util.UUID;
 
 public interface VersionedLockWatchState {
     /**
diff --git a/lock-api/src/main/java/com/palantir/lock/watch/VersionedLockWatchStateImpl.java b/lock-api/src/main/java/com/palantir/lock/watch/VersionedLockWatchStateImpl.java
index f940d42eb8f..0444a3e2eaf 100644
--- a/lock-api/src/main/java/com/palantir/lock/watch/VersionedLockWatchStateImpl.java
+++ b/lock-api/src/main/java/com/palantir/lock/watch/VersionedLockWatchStateImpl.java
@@ -16,14 +16,13 @@
 
 package com.palantir.lock.watch;
 
+import com.google.common.collect.RangeSet;
+import com.palantir.lock.LockDescriptor;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.UUID;
 
-import com.google.common.collect.RangeSet;
-import com.palantir.lock.LockDescriptor;
-
 public class VersionedLockWatchStateImpl implements VersionedLockWatchState {
     private final OptionalLong version;
     private final RangeSet<LockDescriptor> watchedRanges;
diff --git a/lock-api/src/test/java/com/palantir/lock/AtlasLockDescriptorRangesTest.java b/lock-api/src/test/java/com/palantir/lock/AtlasLockDescriptorRangesTest.java
index 7cd5c7decb0..bfbd76aa464 100644
--- a/lock-api/src/test/java/com/palantir/lock/AtlasLockDescriptorRangesTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/AtlasLockDescriptorRangesTest.java
@@ -18,9 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.collect.Range;
+import org.junit.Test;
 
 public class AtlasLockDescriptorRangesTest {
     private static final String TABLE = "test.table";
diff --git a/lock-api/src/test/java/com/palantir/lock/HeldLocksTokenTest.java b/lock-api/src/test/java/com/palantir/lock/HeldLocksTokenTest.java
index f761845734a..6d87cfdaeaa 100644
--- a/lock-api/src/test/java/com/palantir/lock/HeldLocksTokenTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/HeldLocksTokenTest.java
@@ -18,15 +18,13 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableSortedMap;
 import java.math.BigInteger;
 import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableSortedMap;
-
 public final class HeldLocksTokenTest {
 
     private final ObjectMapper mapper = new ObjectMapper();
diff --git a/lock-api/src/test/java/com/palantir/lock/LockClientTest.java b/lock-api/src/test/java/com/palantir/lock/LockClientTest.java
index c13bae3c8e4..a9dcc9ecf9b 100644
--- a/lock-api/src/test/java/com/palantir/lock/LockClientTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/LockClientTest.java
@@ -18,9 +18,8 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
 
 public final class LockClientTest {
     private final ObjectMapper mapper = new ObjectMapper();
diff --git a/lock-api/src/test/java/com/palantir/lock/LockDescriptorTest.java b/lock-api/src/test/java/com/palantir/lock/LockDescriptorTest.java
index fafb2be4a3a..fbe657b5f47 100644
--- a/lock-api/src/test/java/com/palantir/lock/LockDescriptorTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/LockDescriptorTest.java
@@ -19,10 +19,9 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Test;
-
 import com.google.common.base.Charsets;
 import com.google.common.io.BaseEncoding;
+import org.junit.Test;
 
 public class LockDescriptorTest {
 
diff --git a/lock-api/src/test/java/com/palantir/lock/client/AsyncTimeLockUnlockerTest.java b/lock-api/src/test/java/com/palantir/lock/client/AsyncTimeLockUnlockerTest.java
index 3862661215a..1f0f3e3c95b 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/AsyncTimeLockUnlockerTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/AsyncTimeLockUnlockerTest.java
@@ -23,6 +23,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Uninterruptibles;
+import com.palantir.lock.v2.LockToken;
+import com.palantir.lock.v2.TimelockService;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
@@ -30,19 +35,12 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.awaitility.Awaitility;
 import org.awaitility.Duration;
 import org.awaitility.core.ThrowingRunnable;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.Uninterruptibles;
-import com.palantir.lock.v2.LockToken;
-import com.palantir.lock.v2.TimelockService;
-
 public class AsyncTimeLockUnlockerTest {
     private static final int ONE_THOUSAND = 1000;
 
diff --git a/lock-api/src/test/java/com/palantir/lock/client/IdentifiedLockRequestTest.java b/lock-api/src/test/java/com/palantir/lock/client/IdentifiedLockRequestTest.java
index 82b25b76ef1..6f9a9813b3e 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/IdentifiedLockRequestTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/IdentifiedLockRequestTest.java
@@ -18,11 +18,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import org.junit.Test;
 
 public class IdentifiedLockRequestTest {
     private static final String SERIALIZED_LOCK_REQUEST = "{"
diff --git a/lock-api/src/test/java/com/palantir/lock/client/LeasedLockTokenTest.java b/lock-api/src/test/java/com/palantir/lock/client/LeasedLockTokenTest.java
index 7a7ca0dc009..7f339eb3346 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/LeasedLockTokenTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/LeasedLockTokenTest.java
@@ -19,16 +19,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.time.Duration;
-import java.util.UUID;
-
-import org.junit.Test;
-
 import com.palantir.common.time.NanoTime;
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.LeadershipId;
 import com.palantir.lock.v2.Lease;
 import com.palantir.lock.v2.LockToken;
+import java.time.Duration;
+import java.util.UUID;
+import org.junit.Test;
 
 public class LeasedLockTokenTest {
     private static final LockToken LOCK_TOKEN = LockToken.of(UUID.randomUUID());
diff --git a/lock-api/src/test/java/com/palantir/lock/client/LockLeaseServiceTest.java b/lock-api/src/test/java/com/palantir/lock/client/LockLeaseServiceTest.java
index 9c140be0c77..9235434ff32 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/LockLeaseServiceTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/LockLeaseServiceTest.java
@@ -22,18 +22,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.common.time.NanoTime;
@@ -49,6 +37,16 @@
 import com.palantir.lock.v2.PartitionedTimestamps;
 import com.palantir.lock.v2.RefreshLockResponseV2;
 import com.palantir.lock.v2.StartTransactionResponseV4;
+import java.time.Duration;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class LockLeaseServiceTest {
@@ -225,4 +223,3 @@ private LeaderTime getIdentifiedTime() {
         return LeaderTime.of(LEADER_ID, time.get());
     }
 }
-
diff --git a/lock-api/src/test/java/com/palantir/lock/client/LockRefresherTest.java b/lock-api/src/test/java/com/palantir/lock/client/LockRefresherTest.java
index 3bbf4c176b2..bb66a2cd30e 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/LockRefresherTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/LockRefresherTest.java
@@ -22,16 +22,14 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
+import com.palantir.lock.v2.LockToken;
+import com.palantir.lock.v2.TimelockService;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-import com.palantir.lock.v2.LockToken;
-import com.palantir.lock.v2.TimelockService;
-
 public class LockRefresherTest {
 
     private static final long REFRESH_INTERVAL_MILLIS = 1234L;
diff --git a/lock-api/src/test/java/com/palantir/lock/client/LockTokenShareTest.java b/lock-api/src/test/java/com/palantir/lock/client/LockTokenShareTest.java
index d23de7d5f89..6523f67f669 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/LockTokenShareTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/LockTokenShareTest.java
@@ -19,15 +19,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.palantir.lock.v2.LockToken;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.junit.Test;
 
-import com.palantir.lock.v2.LockToken;
-
 public class LockTokenShareTest {
     private static final LockToken LOCK_TOKEN = LockToken.of(UUID.randomUUID());
 
diff --git a/lock-api/src/test/java/com/palantir/lock/client/ProfilingTimelockServiceTest.java b/lock-api/src/test/java/com/palantir/lock/client/ProfilingTimelockServiceTest.java
index a466258fa85..c05c10b232b 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/ProfilingTimelockServiceTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/ProfilingTimelockServiceTest.java
@@ -25,16 +25,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.BooleanSupplier;
-
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.slf4j.Logger;
-
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableSet;
@@ -43,6 +33,14 @@
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.logsafe.Arg;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.slf4j.Logger;
 
 public class ProfilingTimelockServiceTest {
     private static final Duration SHORT_DURATION = ProfilingTimelockService.SLOW_THRESHOLD.dividedBy(5);
diff --git a/lock-api/src/test/java/com/palantir/lock/client/TimeLockClientTest.java b/lock-api/src/test/java/com/palantir/lock/client/TimeLockClientTest.java
index 45e8cc1ad90..a8b3863b0ae 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/TimeLockClientTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/TimeLockClientTest.java
@@ -26,14 +26,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.common.exception.AtlasDbDependencyException;
 import com.palantir.leader.NotCurrentLeaderException;
@@ -47,6 +39,12 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.timestamp.CloseableTimestampService;
 import com.palantir.timestamp.TimestampRange;
+import java.net.ConnectException;
+import java.net.UnknownHostException;
+import java.util.UUID;
+import org.junit.Test;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
 
 public class TimeLockClientTest {
 
diff --git a/lock-api/src/test/java/com/palantir/lock/client/TransactionStarterTest.java b/lock-api/src/test/java/com/palantir/lock/client/TransactionStarterTest.java
index 74ef78af560..6d2fb82474d 100644
--- a/lock-api/src/test/java/com/palantir/lock/client/TransactionStarterTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/client/TransactionStarterTest.java
@@ -17,27 +17,11 @@
 package com.palantir.lock.client;
 
 import static java.util.stream.Collectors.toList;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.IntStream;
-
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.SettableFuture;
@@ -52,6 +36,18 @@
 import com.palantir.lock.v2.PartitionedTimestamps;
 import com.palantir.lock.v2.StartIdentifiedAtlasDbTransactionResponse;
 import com.palantir.lock.v2.StartTransactionResponseV4;
+import java.time.Duration;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.IntStream;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TransactionStarterTest {
diff --git a/lock-api/src/test/java/com/palantir/lock/v2/IdentifiedTimeLockRequestSerializationDeserializationTest.java b/lock-api/src/test/java/com/palantir/lock/v2/IdentifiedTimeLockRequestSerializationDeserializationTest.java
index 52139f6c531..7b43cabd910 100644
--- a/lock-api/src/test/java/com/palantir/lock/v2/IdentifiedTimeLockRequestSerializationDeserializationTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/v2/IdentifiedTimeLockRequestSerializationDeserializationTest.java
@@ -17,17 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.palantir.conjure.java.serialization.ObjectMappers;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.UUID;
-
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.palantir.conjure.java.serialization.ObjectMappers;
-
 public class IdentifiedTimeLockRequestSerializationDeserializationTest {
     private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.newServerObjectMapper();
     private static final UUID SAMPLE_UUID = UUID.fromString("ed4b106f-8718-4858-a402-d99415124cfe");
diff --git a/lock-api/src/test/java/com/palantir/lock/v2/LeadershipIdTest.java b/lock-api/src/test/java/com/palantir/lock/v2/LeadershipIdTest.java
index bde33ec7652..4e741b3f99f 100644
--- a/lock-api/src/test/java/com/palantir/lock/v2/LeadershipIdTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/v2/LeadershipIdTest.java
@@ -18,9 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
 
 public class LeadershipIdTest {
     private static final String SERIALIZED_LEADERSHIP_ID = "\"fc71247c-66a5-4f94-be24-3a2b00d29968\"";
diff --git a/lock-api/src/test/java/com/palantir/lock/v2/LeaseTest.java b/lock-api/src/test/java/com/palantir/lock/v2/LeaseTest.java
index 75912cea089..35a03e8f574 100644
--- a/lock-api/src/test/java/com/palantir/lock/v2/LeaseTest.java
+++ b/lock-api/src/test/java/com/palantir/lock/v2/LeaseTest.java
@@ -18,13 +18,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.time.Duration;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.palantir.common.time.NanoTime;
+import java.time.Duration;
+import org.junit.Test;
 
 public class LeaseTest {
     private static final LeadershipId LEADERSHIP_ID_1 = LeadershipId.random();
diff --git a/lock-api/src/test/java/com/palantir/lock/v2/LockResponseV2Test.java b/lock-api/src/test/java/com/palantir/lock/v2/LockResponseV2Test.java
index 6e55034a513..7894a2d986f 100644
--- a/lock-api/src/test/java/com/palantir/lock/v2/LockResponseV2Test.java
+++ b/lock-api/src/test/java/com/palantir/lock/v2/LockResponseV2Test.java
@@ -19,14 +19,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.time.Duration;
-import java.util.UUID;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.palantir.common.time.NanoTime;
+import java.time.Duration;
+import java.util.UUID;
+import org.junit.Test;
 
 public class LockResponseV2Test {
     private static final LockToken LOCK_TOKEN = LockToken.of(UUID.randomUUID());
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/KnownClientLock.java b/lock-impl/src/main/java/com/palantir/lock/impl/KnownClientLock.java
index 2878e52c987..f2ca2114f33 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/KnownClientLock.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/KnownClientLock.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-
 import com.palantir.lock.LockClient;
 import com.palantir.lock.LockMode;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
 
 /**
  * A reentrant lock linked to a specific {@link LockClient}.
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java b/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java
index de18ebba101..16426ea2627 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LegacyTimelockService.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
@@ -43,6 +38,10 @@
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.timestamp.TimestampRange;
 import com.palantir.timestamp.TimestampService;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * A {@link TimelockService} implementation that delegates to a {@link LockService} and {@link TimestampService}.
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockClientIndices.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockClientIndices.java
index 1ddcc12b7ed..1440e4693a6 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockClientIndices.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockClientIndices.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.Map;
-
-import javax.annotation.concurrent.ThreadSafe;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.palantir.lock.LockClient;
 import com.palantir.logsafe.Preconditions;
+import java.util.Map;
+import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
 @VisibleForTesting
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockServerLock.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockServerLock.java
index 532c6f17d8a..cef8d47fa6a 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockServerLock.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockServerLock.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.MoreObjects;
 import com.palantir.lock.LockClient;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.LockMode;
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LockServerLock implements ClientAwareReadWriteLock {
     private static final Logger log = LoggerFactory.getLogger(LockServerLock.class);
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockServerSync.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockServerSync.java
index def88be6af1..e8f035c0a97 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockServerSync.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockServerSync.java
@@ -15,20 +15,17 @@
  */
 package com.palantir.lock.impl;
 
-import java.util.concurrent.locks.AbstractQueuedSynchronizer;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
 import com.palantir.lock.LockClient;
 import com.palantir.logsafe.Preconditions;
-
 import gnu.trove.iterator.TIntIntIterator;
 import gnu.trove.map.TIntIntMap;
 import gnu.trove.map.hash.TIntIntHashMap;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
 
 class LockServerSync extends AbstractQueuedSynchronizer {
     private static final long serialVersionUID = 1L;
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java
index a934ce99fbc..803bf4c73dc 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceImpl.java
@@ -21,36 +21,6 @@
 import static com.palantir.lock.LockGroupBehavior.LOCK_ALL_OR_NONE;
 import static com.palantir.lock.LockGroupBehavior.LOCK_AS_MANY_AS_POSSIBLE;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.PriorityBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-import javax.annotation.concurrent.ThreadSafe;
-
-import org.joda.time.DateTime;
-import org.joda.time.format.ISODateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.helpers.MessageFormatter;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
@@ -107,6 +77,33 @@
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.util.JMXUtils;
 import com.palantir.util.Ownable;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.annotation.concurrent.ThreadSafe;
+import org.joda.time.DateTime;
+import org.joda.time.format.ISODateTimeFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.MessageFormatter;
 
 /**
  * Implementation of the Lock Server.
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceStateDebugger.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceStateDebugger.java
index 5ad2d0c1d46..3a4d5bb444b 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceStateDebugger.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockServiceStateDebugger.java
@@ -16,12 +16,6 @@
 
 package com.palantir.lock.impl;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.collect.Lists;
@@ -32,6 +26,10 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.LockMode;
 import com.palantir.lock.LockRequest;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import org.immutables.value.Value;
 
 /**
  * Note: This class does NOT strictly guarantee that state returned is up to date across all requests.
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/LockTokenConverter.java b/lock-impl/src/main/java/com/palantir/lock/impl/LockTokenConverter.java
index f0fc6cfc04b..862a576fe8f 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/LockTokenConverter.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/LockTokenConverter.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.lock.impl;
 
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
 import com.palantir.lock.LockRefreshToken;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.logsafe.Preconditions;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.UUID;
 
 class LockTokenConverter {
 
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/SlowLockLogger.java b/lock-impl/src/main/java/com/palantir/lock/impl/SlowLockLogger.java
index f1ded39ebfa..9a8a668953e 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/SlowLockLogger.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/SlowLockLogger.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.lock.impl;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * This is a logger intended for use tracking down problems arising from
  * PDS-50301 (Product hogs threads on timelock server with HTTP/2 protocol). This is currently logging the locks
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledLockService.java b/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledLockService.java
index f38a7c53cf1..9c449953209 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledLockService.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledLockService.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.lock.impl;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Set;
-import java.util.concurrent.Semaphore;
-
-import javax.annotation.Nullable;
-
 import com.palantir.lock.CloseableLockService;
 import com.palantir.lock.HeldLocksGrant;
 import com.palantir.lock.HeldLocksToken;
@@ -32,6 +25,11 @@
 import com.palantir.lock.LockServerOptions;
 import com.palantir.lock.LockService;
 import com.palantir.lock.SimpleHeldLocksToken;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import javax.annotation.Nullable;
 
 public class ThreadPooledLockService implements CloseableLockService {
     private final ThreadPooledWrapper<LockService> wrapper;
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledWrapper.java b/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledWrapper.java
index 4c04a38840d..936db542fd5 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledWrapper.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/ThreadPooledWrapper.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.lock.impl;
 
+import com.palantir.common.base.FunctionCheckedException;
 import java.util.concurrent.Semaphore;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.common.base.FunctionCheckedException;
-
 public class ThreadPooledWrapper<F> {
     private static final Logger log = LoggerFactory.getLogger(ThreadPooledWrapper.class);
 
diff --git a/lock-impl/src/main/java/com/palantir/lock/impl/package-info.java b/lock-impl/src/main/java/com/palantir/lock/impl/package-info.java
index 580036b4e52..28761c016be 100644
--- a/lock-impl/src/main/java/com/palantir/lock/impl/package-info.java
+++ b/lock-impl/src/main/java/com/palantir/lock/impl/package-info.java
@@ -16,4 +16,3 @@
 @ParametersAreNonnullByDefault package com.palantir.lock.impl;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/LockDescriptorMapper.java b/lock-impl/src/main/java/com/palantir/lock/logger/LockDescriptorMapper.java
index f038a3394e3..878d644d771 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/LockDescriptorMapper.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/LockDescriptorMapper.java
@@ -16,13 +16,12 @@
 package com.palantir.lock.logger;
 
 
+import com.google.common.collect.Maps;
+import com.palantir.lock.LockDescriptor;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.Maps;
-import com.palantir.lock.LockDescriptor;
-
 
 /**
  * Lock descriptors may contain obfuscated sensitive information. We want to make it impossible to get a real descriptor,
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceStateLogger.java b/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceStateLogger.java
index 904f008963b..8d2f182931d 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceStateLogger.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceStateLogger.java
@@ -15,22 +15,6 @@
  */
 package com.palantir.lock.logger;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.helpers.MessageFormatter;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -48,6 +32,20 @@
 import com.palantir.lock.impl.LockServerLock;
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.lock.impl.LockServiceStateDebugger;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.MessageFormatter;
 
 public class LockServiceStateLogger {
     private static Logger log = LoggerFactory.getLogger(LockServiceStateLogger.class);
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceTestUtils.java b/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceTestUtils.java
index 4ea0f7d8de3..9e0e0bf5781 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceTestUtils.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/LockServiceTestUtils.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.lock.logger;
 
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.List;
-
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Lists;
 import com.palantir.lock.HeldLocksToken;
@@ -30,6 +24,11 @@
 import com.palantir.lock.LockMode;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.StringLockDescriptor;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
 
 public class LockServiceTestUtils {
     public static final String TEST_LOG_STATE_DIR = "log-state";
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/LockStateYamlWriter.java b/lock-impl/src/main/java/com/palantir/lock/logger/LockStateYamlWriter.java
index a12b338c9dc..051cdf6d774 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/LockStateYamlWriter.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/LockStateYamlWriter.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.lock.logger;
 
+import com.palantir.lock.LockDescriptor;
 import java.io.BufferedWriter;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.representer.Representer;
 
-import com.palantir.lock.LockDescriptor;
-
 /**
  * A simple wrapper for writing lock state as YAML to a file.
  */
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/SanitizedLockRequestProgress.java b/lock-impl/src/main/java/com/palantir/lock/logger/SanitizedLockRequestProgress.java
index d7ad2110c5a..cc7db00f2ec 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/SanitizedLockRequestProgress.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/SanitizedLockRequestProgress.java
@@ -16,16 +16,14 @@
 
 package com.palantir.lock.logger;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.palantir.lock.impl.LockServiceStateDebugger;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.palantir.lock.impl.LockServiceStateDebugger;
-
 @Value.Immutable
 @JsonSerialize(as = ImmutableSanitizedLockRequestProgress.class)
 @JsonDeserialize(as = ImmutableSanitizedLockRequestProgress.class)
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/SimpleLockRequest.java b/lock-impl/src/main/java/com/palantir/lock/logger/SimpleLockRequest.java
index 90b189a33d2..8d149aedc0f 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/SimpleLockRequest.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/SimpleLockRequest.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.lock.logger;
 
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.palantir.lock.BlockingMode;
 import com.palantir.lock.LockGroupBehavior;
 import com.palantir.lock.LockMode;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.TimeDuration;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class SimpleLockRequest {
diff --git a/lock-impl/src/main/java/com/palantir/lock/logger/SimpleTokenInfo.java b/lock-impl/src/main/java/com/palantir/lock/logger/SimpleTokenInfo.java
index 4e493750d49..739c0259e74 100644
--- a/lock-impl/src/main/java/com/palantir/lock/logger/SimpleTokenInfo.java
+++ b/lock-impl/src/main/java/com/palantir/lock/logger/SimpleTokenInfo.java
@@ -15,15 +15,12 @@
  */
 package com.palantir.lock.logger;
 
-import java.util.Date;
-
-import javax.annotation.Nullable;
-
-import org.immutables.value.Value;
-
 import com.palantir.lock.HeldLocksToken;
 import com.palantir.lock.LockMode;
 import com.palantir.logsafe.Preconditions;
+import java.util.Date;
+import javax.annotation.Nullable;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class SimpleTokenInfo {
diff --git a/lock-impl/src/test/java/com/palantir/lock/AllLockTests.java b/lock-impl/src/test/java/com/palantir/lock/AllLockTests.java
index dbb7f5258d8..cf619ddfeee 100644
--- a/lock-impl/src/test/java/com/palantir/lock/AllLockTests.java
+++ b/lock-impl/src/test/java/com/palantir/lock/AllLockTests.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.lock;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
 import com.palantir.lock.client.LockRefreshingLockServiceTest;
 import com.palantir.lock.impl.ClientAwareLockTest;
 import com.palantir.lock.logger.LockServiceStateLoggerTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * Runs all lock server tests.
diff --git a/lock-impl/src/test/java/com/palantir/lock/LockServiceTest.java b/lock-impl/src/test/java/com/palantir/lock/LockServiceTest.java
index 2ecb222a8a4..ba908cc48d7 100644
--- a/lock-impl/src/test/java/com/palantir/lock/LockServiceTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/LockServiceTest.java
@@ -15,21 +15,6 @@
  */
 package com.palantir.lock;
 
-import java.io.File;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
@@ -43,6 +28,19 @@
 import com.palantir.lock.logger.LockServiceTestUtils;
 import com.palantir.util.Mutable;
 import com.palantir.util.Mutables;
+import java.io.File;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Tests for the Lock Server.
diff --git a/lock-impl/src/test/java/com/palantir/lock/client/LockRefreshingLockServiceTest.java b/lock-impl/src/test/java/com/palantir/lock/client/LockRefreshingLockServiceTest.java
index b9ca285a72e..1a5a2ed8614 100644
--- a/lock-impl/src/test/java/com/palantir/lock/client/LockRefreshingLockServiceTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/client/LockRefreshingLockServiceTest.java
@@ -17,14 +17,6 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedMap;
 import com.palantir.lock.HeldLocksToken;
@@ -35,11 +27,16 @@
 import com.palantir.lock.LockRequest.Builder;
 import com.palantir.lock.LockResponse;
 import com.palantir.lock.LockServerOptions;
-import com.palantir.lock.LockService;
 import com.palantir.lock.SimpleTimeDuration;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class LockRefreshingLockServiceTest {
     private LockRefreshingLockService server;
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/ClientAwareLockTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/ClientAwareLockTest.java
index 66aa633961b..69884e2138c 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/ClientAwareLockTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/ClientAwareLockTest.java
@@ -15,6 +15,15 @@
  */
 package com.palantir.lock.impl;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.common.concurrent.InterruptibleFuture;
+import com.palantir.common.concurrent.NamedThreadFactory;
+import com.palantir.common.concurrent.PTExecutors;
+import com.palantir.flake.FlakeRetryingRule;
+import com.palantir.flake.ShouldRetry;
+import com.palantir.lock.LockClient;
+import com.palantir.lock.LockMode;
+import com.palantir.lock.StringLockDescriptor;
 import java.util.Queue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -23,23 +32,12 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.common.concurrent.InterruptibleFuture;
-import com.palantir.common.concurrent.NamedThreadFactory;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.flake.FlakeRetryingRule;
-import com.palantir.flake.ShouldRetry;
-import com.palantir.lock.LockClient;
-import com.palantir.lock.LockMode;
-import com.palantir.lock.StringLockDescriptor;
-
 /**
  * Tests for {@link ClientAwareReadWriteLockImpl}.
  *
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java
index 5bd7079051b..5833f9722ad 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/LegacyTimelockServiceTest.java
@@ -23,17 +23,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.math.BigInteger;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
@@ -52,6 +41,15 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.timestamp.TimestampRange;
 import com.palantir.timestamp.TimestampService;
+import java.math.BigInteger;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
 
 public class LegacyTimelockServiceTest {
 
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/LockServiceImplTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/LockServiceImplTest.java
index d7e2ee9da72..ec91ebb0739 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/LockServiceImplTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/LockServiceImplTest.java
@@ -17,10 +17,19 @@
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-
 import static uk.org.lidalia.slf4jtest.LoggingEvent.debug;
 import static uk.org.lidalia.slf4jtest.LoggingEvent.warn;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableSortedMap;
+import com.palantir.lock.LockClient;
+import com.palantir.lock.LockMode;
+import com.palantir.lock.LockRefreshToken;
+import com.palantir.lock.LockRequest;
+import com.palantir.lock.LockServerOptions;
+import com.palantir.lock.SimpleTimeDuration;
+import com.palantir.lock.StringLockDescriptor;
+import com.palantir.lock.client.LockRefreshingLockService;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
@@ -28,24 +37,11 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.assertj.core.api.Assertions;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableSortedMap;
-import com.palantir.lock.LockClient;
-import com.palantir.lock.LockMode;
-import com.palantir.lock.LockRefreshToken;
-import com.palantir.lock.LockRequest;
-import com.palantir.lock.LockServerOptions;
-import com.palantir.lock.SimpleTimeDuration;
-import com.palantir.lock.StringLockDescriptor;
-import com.palantir.lock.client.LockRefreshingLockService;
-
 import uk.org.lidalia.slf4jext.Level;
 import uk.org.lidalia.slf4jtest.LoggingEvent;
 import uk.org.lidalia.slf4jtest.TestLogger;
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/LockTokenConverterTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/LockTokenConverterTest.java
index 73f41705ea4..c1121bc483c 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/LockTokenConverterTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/LockTokenConverterTest.java
@@ -18,14 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.palantir.lock.LockRefreshToken;
+import com.palantir.lock.v2.LockToken;
 import java.math.BigInteger;
 import java.util.Random;
-
 import org.junit.Test;
 
-import com.palantir.lock.LockRefreshToken;
-import com.palantir.lock.v2.LockToken;
-
 public class LockTokenConverterTest {
 
     private static final Random RANDOM = new Random(123);
diff --git a/lock-impl/src/test/java/com/palantir/lock/impl/ThreadPooledWrapperTest.java b/lock-impl/src/test/java/com/palantir/lock/impl/ThreadPooledWrapperTest.java
index eda396f5196..894d6a99ec8 100644
--- a/lock-impl/src/test/java/com/palantir/lock/impl/ThreadPooledWrapperTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/impl/ThreadPooledWrapperTest.java
@@ -19,6 +19,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import com.google.common.collect.Lists;
+import com.palantir.common.base.FunctionCheckedException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -29,13 +31,9 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Lists;
-import com.palantir.common.base.FunctionCheckedException;
-
 public class ThreadPooledWrapperTest {
     private static final Waiter WAITER = new Waiter();
 
diff --git a/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceSerDeTest.java b/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceSerDeTest.java
index 60eee212ede..dda92cb6f8b 100644
--- a/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceSerDeTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceSerDeTest.java
@@ -17,12 +17,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.math.BigInteger;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -37,6 +31,10 @@
 import com.palantir.lock.LockServerOptions;
 import com.palantir.lock.SimpleTimeDuration;
 import com.palantir.lock.StringLockDescriptor;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.junit.Test;
 
 public class LockServiceSerDeTest {
 
diff --git a/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceStateLoggerTest.java b/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceStateLoggerTest.java
index 9ed2a28b2c8..6fefa478e80 100644
--- a/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceStateLoggerTest.java
+++ b/lock-impl/src/test/java/com/palantir/lock/logger/LockServiceStateLoggerTest.java
@@ -19,26 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.assertj.core.util.Strings;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.yaml.snakeyaml.Yaml;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.MapMaker;
@@ -59,6 +39,24 @@
 import com.palantir.lock.impl.LockClientIndices;
 import com.palantir.lock.impl.LockServerLock;
 import com.palantir.lock.impl.LockServiceImpl;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import org.assertj.core.util.Strings;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.yaml.snakeyaml.Yaml;
 
 public class LockServiceStateLoggerTest {
 
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java
index 25d47989347..f95e680e2b1 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.io.Closeable;
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.paxos.PaxosAcceptorNetworkClient;
 import com.palantir.paxos.PaxosLearnerNetworkClient;
+import java.io.Closeable;
+import java.util.List;
+import org.immutables.value.Value;
 
 @Value.Immutable
 abstract class BatchingNetworkClientFactories implements
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Dependencies.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Dependencies.java
index 5160573a2c2..0d6bc76c9d1 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Dependencies.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Dependencies.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.time.Duration;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-
 import com.palantir.leader.PaxosLeadershipEventRecorder;
 import com.palantir.leader.PingableLeader;
 import com.palantir.paxos.PaxosLearner;
 import com.palantir.timelock.config.PaxosRuntimeConfiguration;
+import java.time.Duration;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
 
 public interface Dependencies {
 
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Factories.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Factories.java
index d4c262872e1..7309dd21a43 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Factories.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Factories.java
@@ -16,10 +16,9 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-
 import com.palantir.paxos.LeaderPinger;
 import com.palantir.timelock.paxos.HealthCheckPinger;
+import java.util.List;
 
 public interface Factories {
     interface LeaderPingerFactory {
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeaderElectionServiceFactory.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeaderElectionServiceFactory.java
index 052b6fb2f7f..fe5aaee1904 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeaderElectionServiceFactory.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeaderElectionServiceFactory.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.time.Duration;
-import java.util.Map;
-
 import com.google.common.collect.Maps;
 import com.palantir.leader.BatchingLeaderElectionService;
 import com.palantir.leader.LeaderElectionServiceBuilder;
 import com.palantir.paxos.PaxosProposer;
+import java.time.Duration;
+import java.util.Map;
 
 public class LeaderElectionServiceFactory {
 
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipComponents.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipComponents.java
index 8a6a0b2d742..19f17aac2c6 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipComponents.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipComponents.java
@@ -16,17 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.common.io.Closer;
@@ -37,6 +26,15 @@
 import com.palantir.timelock.paxos.HealthCheckPinger;
 import com.palantir.timelock.paxos.LeaderPingHealthCheck;
 import com.palantir.timelock.paxos.NamespaceTracker;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LeadershipComponents {
 
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipContextFactory.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipContextFactory.java
index 0637361795f..921875bcdd9 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipContextFactory.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipContextFactory.java
@@ -16,12 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.timelock.paxos.LeadershipComponents.LeadershipContext;
 import com.palantir.atlasdb.timelock.paxos.NetworkClientFactories.Factory;
 import com.palantir.leader.BatchingLeaderElectionService;
@@ -29,6 +23,10 @@
 import com.palantir.leader.PingableLeader;
 import com.palantir.paxos.LeaderPinger;
 import com.palantir.paxos.PaxosLearner;
+import java.time.Duration;
+import java.util.List;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class LeadershipContextFactory implements
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/NetworkClientFactories.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/NetworkClientFactories.java
index b04452a61f5..8024433cfd2 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/NetworkClientFactories.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/NetworkClientFactories.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.palantir.paxos.PaxosAcceptorNetworkClient;
+import com.palantir.paxos.PaxosLearnerNetworkClient;
 import java.io.Closeable;
 import java.util.List;
-
 import org.immutables.value.Value;
 
-import com.palantir.paxos.PaxosAcceptorNetworkClient;
-import com.palantir.paxos.PaxosLearnerNetworkClient;
-
 @Value.Immutable
 @Value.Style(typeInnerBuilder = "DoNotMatch")
 public interface NetworkClientFactories {
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosRemoteClients.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosRemoteClients.java
index a113e145b4c..f855f98f846 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosRemoteClients.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosRemoteClients.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.net.URI;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.ws.rs.Path;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.HostAndPort;
@@ -41,6 +33,11 @@
 import com.palantir.timelock.paxos.TimelockPaxosAcceptorRpcClient;
 import com.palantir.timelock.paxos.TimelockPaxosLearnerRpcClient;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.net.URI;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.ws.rs.Path;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class PaxosRemoteClients {
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResources.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResources.java
index 40b15251964..b71f3ed3b7d 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResources.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResources.java
@@ -16,15 +16,13 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
-
 import org.immutables.value.Value;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
 @Value.Immutable
 public abstract class PaxosResources {
     public abstract PaxosResourcesFactory.PaxosUseCaseContext timestamp();
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResourcesFactory.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResourcesFactory.java
index 191ca9ccafe..5a7006ed71b 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResourcesFactory.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosResourcesFactory.java
@@ -16,18 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.immutables.value.Value;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.timelock.paxos.NetworkClientFactories.Factory;
@@ -45,6 +33,16 @@
 import com.palantir.timelock.config.PaxosRuntimeConfiguration;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
 import com.palantir.timelock.paxos.PaxosRemotingUtils;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.immutables.value.Value;
 
 public final class PaxosResourcesFactory {
 
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderHealthCheckPinger.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderHealthCheckPinger.java
index df0343d1119..c1b8a72b8dc 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderHealthCheckPinger.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderHealthCheckPinger.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.Maps;
 import com.palantir.leader.PingableLeader;
 import com.palantir.timelock.paxos.HealthCheckPinger;
 import com.palantir.timelock.paxos.HealthCheckResponse;
+import java.util.Map;
+import java.util.Set;
 
 public class SingleLeaderHealthCheckPinger implements HealthCheckPinger {
 
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderNetworkClientFactories.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderNetworkClientFactories.java
index 113dc8744aa..f29c0f2bd09 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderNetworkClientFactories.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/SingleLeaderNetworkClientFactories.java
@@ -16,10 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosAcceptorNetworkClient;
 import com.palantir.paxos.PaxosLearner;
@@ -28,6 +24,8 @@
 import com.palantir.paxos.SingleLeaderLearnerNetworkClient;
 import com.palantir.timelock.paxos.TimelockPaxosAcceptorAdapter;
 import com.palantir.timelock.paxos.TimelockPaxosLearnerAdapter;
+import java.util.List;
+import org.immutables.value.Value;
 
 @Value.Immutable
 abstract class SingleLeaderNetworkClientFactories implements
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockLeadershipMetrics.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockLeadershipMetrics.java
index bc90e234750..984fc0ac30c 100644
--- a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockLeadershipMetrics.java
+++ b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockLeadershipMetrics.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -35,6 +28,11 @@
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.tritium.metrics.registry.MetricName;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class TimelockLeadershipMetrics implements Dependencies.LeadershipMetrics {
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/ClusterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/ClusterConfiguration.java
index 9b3d34ded89..412b578716a 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/ClusterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/ClusterConfiguration.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.timelock.config;
 
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.palantir.conjure.java.api.config.service.PartialServiceConfiguration;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.util.List;
+import org.immutables.value.Value;
 
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterConfiguration.java
index a72158fe479..173a063ef73 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterConfiguration.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableDatabaseTsBoundPersisterConfiguration.class)
 @JsonSerialize(as = ImmutableDatabaseTsBoundPersisterConfiguration.class)
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/DefaultClusterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/DefaultClusterConfiguration.java
index 5b26eded27e..b2935927a77 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/DefaultClusterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/DefaultClusterConfiguration.java
@@ -16,12 +16,10 @@
 package com.palantir.timelock.config;
 
 
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.List;
+import org.immutables.value.Value;
 
 /** Generates cluster membership based upon pre-populated values. */
 @Value.Immutable
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/KubernetesClusterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/KubernetesClusterConfiguration.java
index e5ec340b7b1..15bce0b9281 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/KubernetesClusterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/KubernetesClusterConfiguration.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.timelock.config;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.palantir.timelock.utils.KubernetesHostnames;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.immutables.value.Value;
 
 /**
  * Generates the current hostname, and those of the expected members of the cluster if the server is being executed
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosInstallConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosInstallConfiguration.java
index ca0f560b4a5..83df2425f8a 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosInstallConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosInstallConfiguration.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.timelock.config;
 
-import java.io.File;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
+import java.io.File;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutablePaxosInstallConfiguration.class)
 @JsonSerialize(as = ImmutablePaxosInstallConfiguration.class)
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosRuntimeConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosRuntimeConfiguration.java
index f4abd04518c..08a8e296309 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosRuntimeConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosRuntimeConfiguration.java
@@ -15,15 +15,13 @@
  */
 package com.palantir.timelock.config;
 
-import java.time.Duration;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
+import java.time.Duration;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutablePaxosRuntimeConfiguration.class)
 @JsonSerialize(as = ImmutablePaxosRuntimeConfiguration.class)
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosTsBoundPersisterConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosTsBoundPersisterConfiguration.java
index 5e321f591b0..b36593ed508 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosTsBoundPersisterConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/PaxosTsBoundPersisterConfiguration.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutablePaxosTsBoundPersisterConfiguration.class)
 @JsonSerialize(as = ImmutablePaxosTsBoundPersisterConfiguration.class)
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockInstallConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockInstallConfiguration.java
index 8450d0cad51..8850e4e7c2a 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockInstallConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockInstallConfiguration.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.timelock.config;
 
-import java.util.Map;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.debug.LockDiagnosticConfig;
 import com.palantir.atlasdb.timelock.paxos.Client;
+import java.util.Map;
+import org.immutables.value.Value;
 
 /**
  * Static (not live-reloaded) portions of TimeLock's configuration.
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java
index 9831d618be7..198f07a7851 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.timelock.config.TargetedSweepLockControlConfig;
 import com.palantir.atlasdb.timelock.lock.watch.LockWatchTestRuntimeConfig;
+import org.immutables.value.Value;
 
 /**
  * Dynamic (live-reloaded) portions of TimeLock's configuration.
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/AsyncTimeLockServicesCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/AsyncTimeLockServicesCreator.java
index 6b4b37e2034..13923e2eded 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/AsyncTimeLockServicesCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/AsyncTimeLockServicesCreator.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.InstrumentedScheduledExecutorService;
 import com.google.common.base.Suppliers;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -44,6 +36,12 @@
 import com.palantir.lock.LockService;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AsyncTimeLockServicesCreator implements TimeLockServicesCreator {
     private static final Logger log = LoggerFactory.getLogger(AsyncTimeLockServicesCreator.class);
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/DbBoundTimestampCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/DbBoundTimestampCreator.java
index 3415a79d3b6..8e5fe6e9a82 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/DbBoundTimestampCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/DbBoundTimestampCreator.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.config.LeaderConfig;
@@ -32,6 +29,8 @@
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 public class DbBoundTimestampCreator implements TimestampCreator {
 
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/HealthCheckDigest.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/HealthCheckDigest.java
index 875851f143b..277cbcfb5a0 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/HealthCheckDigest.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/HealthCheckDigest.java
@@ -16,11 +16,10 @@
 
 package com.palantir.timelock.paxos;
 
-import org.immutables.value.Value;
-
 import com.google.common.collect.SetMultimap;
 import com.palantir.atlasdb.timelock.paxos.Client;
 import com.palantir.timelock.TimeLockStatus;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface HealthCheckDigest {
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/LeaderPingHealthCheck.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/LeaderPingHealthCheck.java
index 5287c19a282..546925bed9c 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/LeaderPingHealthCheck.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/LeaderPingHealthCheck.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.time.Duration;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
@@ -34,6 +26,13 @@
 import com.palantir.paxos.PaxosQuorumChecker;
 import com.palantir.paxos.PaxosResponses;
 import com.palantir.timelock.TimeLockStatus;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
 
 public class LeaderPingHealthCheck {
 
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/LockCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/LockCreator.java
index bb2c538cfd7..803502e4da8 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/LockCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/LockCreator.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Semaphore;
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.timelock.lock.BlockingTimeLimitedLockService;
 import com.palantir.common.concurrent.NamedThreadFactory;
 import com.palantir.common.concurrent.PTExecutors;
@@ -27,6 +23,9 @@
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.lock.impl.ThreadPooledLockService;
 import com.palantir.timelock.config.TimeLockRuntimeConfiguration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Semaphore;
+import java.util.function.Supplier;
 
 public class LockCreator {
     private final Supplier<TimeLockRuntimeConfiguration> runtime;
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/NamespaceTracker.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/NamespaceTracker.java
index ae084044116..058330ff67d 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/NamespaceTracker.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/NamespaceTracker.java
@@ -16,9 +16,8 @@
 
 package com.palantir.timelock.paxos;
 
-import java.util.Set;
-
 import com.palantir.atlasdb.timelock.paxos.Client;
+import java.util.Set;
 
 public interface NamespaceTracker {
     Set<Client> trackedNamespaces();
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosRemotingUtils.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosRemotingUtils.java
index 49ba4883747..b0d8ac1e2b8 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosRemotingUtils.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosRemotingUtils.java
@@ -15,6 +15,11 @@
  */
 package com.palantir.timelock.paxos;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
+import com.palantir.timelock.config.ClusterConfiguration;
+import com.palantir.timelock.config.TimeLockInstallConfiguration;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collection;
@@ -22,15 +27,8 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import javax.ws.rs.core.UriBuilder;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
-import com.palantir.timelock.config.ClusterConfiguration;
-import com.palantir.timelock.config.TimeLockInstallConfiguration;
-
 public final class PaxosRemotingUtils {
     private PaxosRemotingUtils() {
         // utility class
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosTimestampCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosTimestampCreator.java
index 72523462f01..c8860a60920 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosTimestampCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/PaxosTimestampCreator.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.timelock.paxos.Client;
 import com.palantir.atlasdb.timelock.paxos.NetworkClientFactories;
@@ -30,6 +28,7 @@
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.PersistentTimestampServiceImpl;
 import com.palantir.timestamp.TimestampBoundStore;
+import java.util.function.Supplier;
 
 public class PaxosTimestampCreator implements TimestampCreator {
 
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockAgent.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockAgent.java
index c2e82d755b7..1ab572cd950 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockAgent.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockAgent.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.net.URL;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
 import com.codahale.metrics.InstrumentedExecutorService;
 import com.codahale.metrics.InstrumentedThreadFactory;
 import com.codahale.metrics.MetricRegistry;
@@ -52,6 +45,12 @@
 import com.palantir.timelock.config.TimeLockRuntimeConfiguration;
 import com.palantir.timelock.config.TsBoundPersisterConfiguration;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.net.URL;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 @SuppressWarnings("checkstyle:FinalClass") // This is mocked internally
 public class TimeLockAgent {
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockServicesCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockServicesCreator.java
index 6459b7c8918..552fddd806c 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockServicesCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimeLockServicesCreator.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.timelock.TimeLockServices;
 import com.palantir.atlasdb.timelock.paxos.Client;
 import com.palantir.lock.LockService;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.function.Supplier;
 
 public interface TimeLockServicesCreator {
     /**
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosAcceptorAdapter.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosAcceptorAdapter.java
index c4177438d58..3f1b0fca284 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosAcceptorAdapter.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosAcceptorAdapter.java
@@ -16,10 +16,6 @@
 
 package com.palantir.timelock.paxos;
 
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import com.palantir.atlasdb.timelock.paxos.Client;
 import com.palantir.atlasdb.timelock.paxos.PaxosRemoteClients;
 import com.palantir.atlasdb.timelock.paxos.PaxosUseCase;
@@ -29,6 +25,9 @@
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public final class TimelockPaxosAcceptorAdapter implements PaxosAcceptor {
     private final PaxosUseCase paxosUseCase;
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosAcceptorRpcClient.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosAcceptorRpcClient.java
index dcd17c3b53e..106ea603c4e 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosAcceptorRpcClient.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosAcceptorRpcClient.java
@@ -16,13 +16,6 @@
 
 package com.palantir.timelock.paxos;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
 import com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants;
 import com.palantir.atlasdb.timelock.paxos.PaxosUseCase;
 import com.palantir.paxos.BooleanPaxosResponse;
@@ -30,6 +23,12 @@
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
 
 /**
  * This interface is used internally by timelock to allow creating a single feign proxy where different clients and
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosLearnerAdapter.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosLearnerAdapter.java
index 842a8607c3f..dd8e8d640cf 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosLearnerAdapter.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosLearnerAdapter.java
@@ -16,18 +16,17 @@
 
 package com.palantir.timelock.paxos;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import com.palantir.atlasdb.timelock.paxos.Client;
 import com.palantir.atlasdb.timelock.paxos.PaxosRemoteClients;
 import com.palantir.atlasdb.timelock.paxos.PaxosUseCase;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.paxos.PaxosLearner;
 import com.palantir.paxos.PaxosValue;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public final class TimelockPaxosLearnerAdapter implements PaxosLearner {
     private final PaxosUseCase paxosUseCase;
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosLearnerRpcClient.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosLearnerRpcClient.java
index f885df3eb9a..39687aafc55 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosLearnerRpcClient.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimelockPaxosLearnerRpcClient.java
@@ -16,9 +16,13 @@
 
 package com.palantir.timelock.paxos;
 
+import com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants;
+import com.palantir.atlasdb.timelock.paxos.PaxosUseCase;
+import com.palantir.common.annotation.Inclusive;
+import com.palantir.paxos.PaxosLearner;
+import com.palantir.paxos.PaxosValue;
 import java.util.Collection;
 import java.util.Optional;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -27,12 +31,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants;
-import com.palantir.atlasdb.timelock.paxos.PaxosUseCase;
-import com.palantir.common.annotation.Inclusive;
-import com.palantir.paxos.PaxosLearner;
-import com.palantir.paxos.PaxosValue;
-
 /**
  * This interface is used internally by timelock to allow creating a single feign proxy where different clients and
  * different paxos use cases can be injected using {@link TimelockPaxosLearnerAdapter} to create
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimestampCreator.java b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimestampCreator.java
index 335008869cd..726e46e5dd2 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimestampCreator.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/paxos/TimestampCreator.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.timelock.paxos;
 
-import java.util.function.Supplier;
-
 import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.timelock.paxos.Client;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.function.Supplier;
 
 public interface TimestampCreator {
     Supplier<ManagedTimestampService> createTimestampService(Client client, LeaderConfig leaderConfig);
diff --git a/timelock-agent/src/main/java/com/palantir/timelock/utils/KubernetesHostnames.java b/timelock-agent/src/main/java/com/palantir/timelock/utils/KubernetesHostnames.java
index 6fa32130320..3503cf3c18c 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/utils/KubernetesHostnames.java
+++ b/timelock-agent/src/main/java/com/palantir/timelock/utils/KubernetesHostnames.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.timelock.utils;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.palantir.logsafe.SafeArg;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
@@ -23,14 +26,9 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.palantir.logsafe.SafeArg;
-
 public final class KubernetesHostnames {
 
     public static final KubernetesHostnames INSTANCE = new KubernetesHostnames(() -> {
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationDeserializationTest.java b/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationDeserializationTest.java
index af59a29a84f..218c071f6d8 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationDeserializationTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationDeserializationTest.java
@@ -18,20 +18,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
+import com.google.common.collect.ImmutableSet;
 import java.io.File;
 import java.io.IOException;
 import java.util.Set;
-
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
-import com.google.common.collect.ImmutableSet;
-
 public class ClusterConfigurationDeserializationTest {
     private static final String LOCAL_SERVER = "https://server-2:8421";
     private static final Set<String> SERVERS = ImmutableSet.of(
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationTest.java b/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationTest.java
index 40fc5920da9..f0d5346c6b7 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/config/ClusterConfigurationTest.java
@@ -20,16 +20,14 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.conjure.java.api.config.service.PartialServiceConfiguration;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.conjure.java.api.config.service.PartialServiceConfiguration;
-
 public class ClusterConfigurationTest {
 
     private static final String ADDRESS_1 = "localhost:1";
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/config/DefaultClusterConfigurationTest.java b/timelock-agent/src/test/java/com/palantir/timelock/config/DefaultClusterConfigurationTest.java
index b1705b939c2..bf36b61bdc6 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/config/DefaultClusterConfigurationTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/config/DefaultClusterConfigurationTest.java
@@ -17,12 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.conjure.java.api.config.service.PartialServiceConfiguration;
+import java.util.Optional;
+import org.junit.Test;
 
 public class DefaultClusterConfigurationTest {
     private static final String ADDRESS_1 = "localhost:1";
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/config/PaxosInstallConfigurationTest.java b/timelock-agent/src/test/java/com/palantir/timelock/config/PaxosInstallConfigurationTest.java
index a76df0adce6..e9e1e162884 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/config/PaxosInstallConfigurationTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/config/PaxosInstallConfigurationTest.java
@@ -23,7 +23,6 @@
 import static org.mockito.Mockito.when;
 
 import java.io.File;
-
 import org.junit.Test;
 
 public class PaxosInstallConfigurationTest {
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/paxos/LeaderPingHealthCheckTest.java b/timelock-agent/src/test/java/com/palantir/timelock/paxos/LeaderPingHealthCheckTest.java
index 41ce8db5e08..07c9bacc71a 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/paxos/LeaderPingHealthCheckTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/paxos/LeaderPingHealthCheckTest.java
@@ -19,12 +19,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
@@ -33,6 +27,10 @@
 import com.palantir.atlasdb.http.errors.AtlasDbRemoteException;
 import com.palantir.atlasdb.timelock.paxos.Client;
 import com.palantir.timelock.TimeLockStatus;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.junit.Test;
 
 public class LeaderPingHealthCheckTest {
 
diff --git a/timelock-agent/src/test/java/com/palantir/timelock/paxos/PaxosRemotingUtilsTest.java b/timelock-agent/src/test/java/com/palantir/timelock/paxos/PaxosRemotingUtilsTest.java
index 3abf5080169..2d4e1e31b95 100644
--- a/timelock-agent/src/test/java/com/palantir/timelock/paxos/PaxosRemotingUtilsTest.java
+++ b/timelock-agent/src/test/java/com/palantir/timelock/paxos/PaxosRemotingUtilsTest.java
@@ -19,14 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Optional;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -38,6 +30,12 @@
 import com.palantir.timelock.config.ImmutableTimeLockInstallConfiguration;
 import com.palantir.timelock.config.PaxosInstallConfiguration;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+import org.junit.Test;
 
 public class PaxosRemotingUtilsTest {
     private static final List<String> CLUSTER_URIS = ImmutableList.of("foo:1", "bar:2", "baz:3");
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java
index aa8b4fc9e37..b2bcc5d30f0 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockResource.java
@@ -15,21 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.util.Optional;
-import java.util.OptionalLong;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.MediaType;
-
 import com.palantir.atlasdb.debug.LockDiagnosticInfo;
 import com.palantir.atlasdb.timelock.lock.AsyncResult;
 import com.palantir.atlasdb.timelock.lock.Leased;
@@ -55,6 +40,19 @@
 import com.palantir.lock.watch.TimestampWithWatches;
 import com.palantir.logsafe.Safe;
 import com.palantir.timestamp.TimestampRange;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.UUID;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.MediaType;
 
 @Path("/timelock")
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockService.java
index e934e3e2ac3..dedcf4c55fb 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockService.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.io.Closeable;
-import java.util.OptionalLong;
-import java.util.Set;
-
 import com.palantir.atlasdb.timelock.lock.AsyncResult;
 import com.palantir.atlasdb.timelock.lock.Leased;
 import com.palantir.atlasdb.timelock.lock.watch.LockWatchingService;
@@ -38,6 +34,9 @@
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.lock.watch.TimestampWithWatches;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.io.Closeable;
+import java.util.OptionalLong;
+import java.util.Set;
 
 public interface AsyncTimelockService extends ManagedTimestampService, LockWatchingService, Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImpl.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImpl.java
index 6f8ca0b4e3c..25c51f4829a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImpl.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImpl.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.util.OptionalLong;
-import java.util.Set;
-import java.util.UUID;
-
 import com.palantir.atlasdb.timelock.lock.AsyncLockService;
 import com.palantir.atlasdb.timelock.lock.AsyncResult;
 import com.palantir.atlasdb.timelock.lock.Leased;
@@ -48,6 +44,9 @@
 import com.palantir.lock.watch.TimestampWithWatches;
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampRange;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.UUID;
 
 public class AsyncTimelockServiceImpl implements AsyncTimelockService {
     private final AsyncLockService lockService;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockResource.java
index 094af83a1c4..9a5aaa93698 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockResource.java
@@ -15,18 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
@@ -40,6 +28,15 @@
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Path("/{namespace: [a-zA-Z0-9_-]+}")
 public class TimeLockResource {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockServices.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockServices.java
index e93aecfc0e1..df396daf82e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockServices.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TimeLockServices.java
@@ -15,12 +15,11 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.timelock.lock.watch.LockWatchingResource;
 import com.palantir.lock.LockService;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampService;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface TimeLockServices {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TooManyRequestsExceptionMapper.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TooManyRequestsExceptionMapper.java
index c899ac9bd5b..b35c0781b7a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TooManyRequestsExceptionMapper.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/TooManyRequestsExceptionMapper.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-
 import com.palantir.atlasdb.http.ExceptionMappers;
 import com.palantir.lock.impl.TooManyRequestsException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
 
 public class TooManyRequestsExceptionMapper implements ExceptionMapper<TooManyRequestsException> {
     public static final int TOO_MANY_REQUESTS_429 = 429;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/BCryptedSecret.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/BCryptedSecret.java
index 0837c42d46d..b5256881b48 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/BCryptedSecret.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/BCryptedSecret.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.timelock.auth.api;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import org.immutables.value.Value;
 import org.mindrot.jbcrypt.BCrypt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-
 @Value.Immutable
 public abstract class BCryptedSecret {
     private static final Logger log = LoggerFactory.getLogger(BCryptedSecret.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/ClientId.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/ClientId.java
index 8f004c8560f..190f707bda9 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/ClientId.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/ClientId.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.timelock.auth.api;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableClientId.class)
 @JsonDeserialize(as = ImmutableClientId.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/Credentials.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/Credentials.java
index 2085d85135b..41e1ab1b0fc 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/Credentials.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/api/Credentials.java
@@ -16,10 +16,9 @@
 
 package com.palantir.atlasdb.timelock.auth.api;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
 
 @JsonDeserialize(as = ImmutableCredentials.class)
 @JsonSerialize(as = ImmutableCredentials.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/AdminPrivilegesConfiguration.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/AdminPrivilegesConfiguration.java
index 2132a7bce28..3ff4c811643 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/AdminPrivilegesConfiguration.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/AdminPrivilegesConfiguration.java
@@ -16,14 +16,13 @@
 
 package com.palantir.atlasdb.timelock.auth.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableAdminPrivilegesConfiguration.class)
 @JsonDeserialize(as = ImmutableAdminPrivilegesConfiguration.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/ClientPrivilegesConfiguration.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/ClientPrivilegesConfiguration.java
index 5eae258cb93..d55cb19003e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/ClientPrivilegesConfiguration.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/ClientPrivilegesConfiguration.java
@@ -16,10 +16,6 @@
 
 package com.palantir.atlasdb.timelock.auth.config;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -27,6 +23,8 @@
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableClientPrivilegesConfiguration.class)
 @JsonDeserialize(as = ImmutableClientPrivilegesConfiguration.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/NamespacePrivileges.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/NamespacePrivileges.java
index 8669222be4f..c86cd77d958 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/NamespacePrivileges.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/NamespacePrivileges.java
@@ -16,12 +16,10 @@
 
 package com.palantir.atlasdb.timelock.auth.config;
 
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class NamespacePrivileges implements Privileges {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfiguration.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfiguration.java
index 2aba3522360..6a9faf57c0e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfiguration.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfiguration.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.timelock.auth.config;
 
-import java.util.List;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.atlasdb.timelock.auth.api.Credentials;
+import java.util.List;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableTimelockAuthConfiguration.class)
 @JsonDeserialize(as = ImmutableTimelockAuthConfiguration.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticator.java
index 2ea9af50b24..29d360f6f20 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticator.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.timelock.auth.impl;
 
-import java.util.Map;
-import java.util.Optional;
-
-import org.immutables.value.Value;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.collect.ImmutableMap;
@@ -29,6 +24,9 @@
 import com.palantir.atlasdb.timelock.auth.api.BCryptedSecret;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Password;
+import java.util.Map;
+import java.util.Optional;
+import org.immutables.value.Value;
 
 public class CachingAuthenticator implements Authenticator {
     private final ImmutableMap<ClientId, BCryptedSecret> credentials;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/NamespaceLocker.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/NamespaceLocker.java
index cb93e29ce51..e7e6c313188 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/NamespaceLocker.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/NamespaceLocker.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.timelock.auth.impl;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.Map;
 
 interface NamespaceLocker {
     NamespaceLocker ALL_LOCKED = ignored -> true;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLocker.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLocker.java
index 51eb59e2945..6e52c764121 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLocker.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLocker.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.timelock.auth.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class PrivilegeBasedNamespaceLocker implements NamespaceLocker {
     private List<Privileges> nonAdminPrivileges;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizer.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizer.java
index 3752a671409..df41f7554c6 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizer.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizer.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.auth.impl;
 
-import java.util.Map;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
+import com.palantir.atlasdb.timelock.auth.api.Authorizer;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
-import com.palantir.atlasdb.timelock.auth.api.Authorizer;
-import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
+import java.util.Map;
 
 public class SimpleAuthorizer implements Authorizer {
     private final Map<ClientId, Privileges> privileges;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfig.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfig.java
index 243867b652f..b16f04df28b 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfig.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfig.java
@@ -18,14 +18,12 @@
 
 import static com.palantir.atlasdb.timelock.lock.TargetedSweepLockDecorator.LOCK_ACQUIRES_PER_SECOND;
 
-import java.util.Map;
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.Map;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonDeserialize(as = ImmutableTargetedSweepLockControlConfig.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TimeLimiterConfiguration.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TimeLimiterConfiguration.java
index 3f58f43a5d1..2e264c8e50a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TimeLimiterConfiguration.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/config/TimeLimiterConfiguration.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.config;
 
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableTimeLimiterConfiguration.class)
 @JsonDeserialize(as = ImmutableTimeLimiterConfiguration.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLock.java
index 5daa55a94f9..bc8b4504f2e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLock.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.UUID;
-
 import com.palantir.lock.LockDescriptor;
+import java.util.UUID;
 
 public interface AsyncLock {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java
index 29d315757a6..39aa953a10d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncLockService.java
@@ -15,17 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.io.Closeable;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.timelock.config.TargetedSweepLockControlConfig.RateLimitConfig;
@@ -36,6 +25,15 @@
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.RefreshLockResponseV2;
+import java.io.Closeable;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AsyncLockService implements Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncResult.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncResult.java
index 2e235bacded..d7bea13ae73 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncResult.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AsyncResult.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
+import com.palantir.logsafe.Preconditions;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-
-import com.palantir.logsafe.Preconditions;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 import net.jcip.annotations.ThreadSafe;
 
 @ThreadSafe
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollection.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollection.java
index 2a2a13d98f1..6d25c11f242 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollection.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollection.java
@@ -15,13 +15,12 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Maps;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Supplier;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Maps;
-
 // TODO(nziebart): can we combine this logic with HeldLocksCollection?
 // Or, should awaitLocks just be implemented by a lock + unlock?
 public class AwaitedLocksCollection {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockService.java
index b919bd9ff9a..cbb55908124 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockService.java
@@ -15,20 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import javax.annotation.Nullable;
-import javax.ws.rs.PathParam;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.SimpleTimeLimiter;
@@ -46,6 +32,17 @@
 import com.palantir.lock.remoting.BlockingTimeoutException;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import javax.annotation.Nullable;
+import javax.ws.rs.PathParam;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BlockingTimeLimitedLockService implements CloseableLockService {
     private static final Logger log = LoggerFactory.getLogger(BlockingTimeLimitedLockService.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/CombinedLockEvents.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/CombinedLockEvents.java
index 4cc9f8d7c02..2fc4b263ccb 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/CombinedLockEvents.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/CombinedLockEvents.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
+import com.palantir.lock.LockDescriptor;
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
 
-import com.palantir.lock.LockDescriptor;
-
 public class CombinedLockEvents implements LockEvents {
 
     private final List<LockEvents> lockEvents;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ExclusiveLock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ExclusiveLock.java
index 174b84e901c..fb0b086f210 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ExclusiveLock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ExclusiveLock.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.LinkedHashMap;
-import java.util.Objects;
-import java.util.UUID;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.NotThreadSafe;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.timelock.util.LoggableIllegalStateException;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.logsafe.SafeArg;
+import java.util.LinkedHashMap;
+import java.util.Objects;
+import java.util.UUID;
+import javax.annotation.concurrent.GuardedBy;
+import javax.annotation.concurrent.NotThreadSafe;
 
 public class ExclusiveLock implements AsyncLock {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocks.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocks.java
index 322d31f002c..c1f163e5d82 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocks.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocks.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Collection;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.annotation.concurrent.GuardedBy;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Suppliers;
 import com.palantir.atlasdb.timelock.lock.watch.LockWatchingService;
 import com.palantir.common.time.NanoTime;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockToken;
+import java.util.Collection;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import javax.annotation.concurrent.GuardedBy;
 
 public class HeldLocks {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollection.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollection.java
index f136d8d4607..c1afbab09f6 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollection.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollection.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -30,6 +23,12 @@
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.Lease;
 import com.palantir.lock.v2.LockToken;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 public class HeldLocksCollection {
     @VisibleForTesting
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampLock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampLock.java
index 735638423cf..1cedf28cd2f 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampLock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampLock.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.UUID;
-
-import javax.ws.rs.NotSupportedException;
-
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
+import java.util.UUID;
+import javax.ws.rs.NotSupportedException;
 
 public class ImmutableTimestampLock implements AsyncLock {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTracker.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTracker.java
index 13749505bd2..597f664e513 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTracker.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTracker.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Optional;
-import java.util.SortedMap;
-import java.util.UUID;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.timelock.util.LoggableIllegalStateException;
 import com.palantir.logsafe.SafeArg;
-
+import java.util.Optional;
+import java.util.SortedMap;
+import java.util.UUID;
 import net.jcip.annotations.GuardedBy;
 
 public class ImmutableTimestampTracker {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaderClock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaderClock.java
index 3cd89d3af42..1562a18c6a0 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaderClock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaderClock.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.function.Supplier;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.common.time.NanoTime;
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.LeadershipId;
+import java.util.function.Supplier;
 
 public class LeaderClock {
     private final LeadershipId leadershipId;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimer.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimer.java
index f85573b6c70..c54c5520e99 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimer.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimer.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.function.Supplier;
-
 import com.palantir.common.time.NanoTime;
+import java.util.function.Supplier;
 
 public class LeaseExpirationTimer {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockAcquirer.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockAcquirer.java
index 8c46b74c407..e4e4a10b9a2 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockAcquirer.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockAcquirer.java
@@ -15,18 +15,16 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
+import com.google.common.base.Throwables;
+import com.palantir.atlasdb.timelock.lock.watch.LockWatchingService;
+import com.palantir.logsafe.SafeArg;
 import java.util.UUID;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Throwables;
-import com.palantir.atlasdb.timelock.lock.watch.LockWatchingService;
-import com.palantir.logsafe.SafeArg;
-
 public class LockAcquirer implements AutoCloseable {
 
     private static final Logger log = LoggerFactory.getLogger(LockAcquirer.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockCollection.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockCollection.java
index e9a9f797895..f80eaa532a9 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockCollection.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockCollection.java
@@ -16,14 +16,13 @@
 package com.palantir.atlasdb.timelock.lock;
 
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.collect.Lists;
 import com.palantir.lock.LockDescriptor;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
 
 public class LockCollection {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockDiagnosticCollector.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockDiagnosticCollector.java
index bd5b313c672..2a3dc0c0fec 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockDiagnosticCollector.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockDiagnosticCollector.java
@@ -16,18 +16,6 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
-import java.time.Instant;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.collect.ImmutableMap;
@@ -41,6 +29,16 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.time.Instant;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This should be removed once PDS-95791 is complete.
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockEvents.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockEvents.java
index 5a8fbcf3a03..2d679c4b813 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockEvents.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockEvents.java
@@ -16,16 +16,14 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
+import com.palantir.lock.LockDescriptor;
+import com.palantir.lock.client.IdentifiedLockRequest;
+import com.palantir.lock.v2.WaitForLocksRequest;
 import java.util.Collection;
 import java.util.Set;
 import java.util.UUID;
-
 import org.immutables.value.Value;
 
-import com.palantir.lock.LockDescriptor;
-import com.palantir.lock.client.IdentifiedLockRequest;
-import com.palantir.lock.v2.WaitForLocksRequest;
-
 public interface LockEvents {
     void registerRequest(RequestInfo request);
     void timedOut(RequestInfo request, long acquisitionTimeMillis);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockLog.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockLog.java
index d29ed003be2..64ef1be4d74 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockLog.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LockLog.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Collection;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Supplier;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -31,6 +25,11 @@
 import com.palantir.lock.client.IdentifiedLockRequest;
 import com.palantir.lock.v2.WaitForLocksRequest;
 import com.palantir.logsafe.Preconditions;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Supplier;
 
 public final class LockLog {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LoggingLockEvents.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LoggingLockEvents.java
index 6a3c569a7c3..8d2d8ed9f8a 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LoggingLockEvents.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LoggingLockEvents.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.Collection;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
@@ -30,6 +22,12 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LoggingLockEvents implements LockEvents {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/NonTransactionalLockService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/NonTransactionalLockService.java
index bb8034a61db..b222988ee43 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/NonTransactionalLockService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/NonTransactionalLockService.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
-import javax.ws.rs.BadRequestException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.lock.LockService;
 import com.palantir.lock.SimplifyingLockService;
 import com.palantir.logsafe.UnsafeArg;
+import javax.ws.rs.BadRequestException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This lock service may be used as a LockService, for the purposes of advisory locking as well as for
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocks.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocks.java
index 4cd358ac8b0..816baab9208 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocks.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocks.java
@@ -15,12 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.lock;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
-
 import org.immutables.value.Value;
 
-import com.google.common.collect.ImmutableList;
-
 @Value.Immutable
 public interface OrderedLocks {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocksDecorator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocksDecorator.java
index 6fe362d0369..c5e48124cc0 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocksDecorator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/OrderedLocksDecorator.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
-import java.util.List;
-
 import com.palantir.lock.LockDescriptor;
+import java.util.List;
 
 public interface OrderedLocksDecorator {
     OrderedLocksDecorator DO_NOTHING = (descriptors, locks) -> OrderedLocks.fromOrderedList(locks);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLock.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLock.java
index 7884a275df8..4532d793f60 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLock.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLock.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
+import com.google.common.util.concurrent.RateLimiter;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.logsafe.SafeArg;
 import java.util.UUID;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BooleanSupplier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.util.concurrent.RateLimiter;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.logsafe.SafeArg;
-
 public class TargetedSweepAsyncLock implements AsyncLock {
 
     private static final Logger log = LoggerFactory.getLogger(TargetedSweepAsyncLock.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecorator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecorator.java
index 6845ff2fa2b..1f717b5c80d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecorator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecorator.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.timelock.lock;
 
-import java.io.Closeable;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Supplier;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.annotations.VisibleForTesting;
@@ -39,6 +31,13 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.util.Pair;
+import java.io.Closeable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Supplier;
 
 public final class TargetedSweepLockDecorator implements OrderedLocksDecorator, Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/ArrayLockEventSlidingWindow.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/ArrayLockEventSlidingWindow.java
index b389a1ffa2f..aec0f00be21 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/ArrayLockEventSlidingWindow.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/ArrayLockEventSlidingWindow.java
@@ -16,17 +16,15 @@
 
 package com.palantir.atlasdb.timelock.lock.watch;
 
+import com.google.common.math.LongMath;
+import com.google.common.primitives.Ints;
+import com.palantir.lock.watch.LockWatchEvent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalLong;
-
 import javax.annotation.concurrent.ThreadSafe;
 
-import com.google.common.math.LongMath;
-import com.google.common.primitives.Ints;
-import com.palantir.lock.watch.LockWatchEvent;
-
 @ThreadSafe
 public class ArrayLockEventSlidingWindow {
     private final LockWatchEvent[] buffer;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockEventLog.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockEventLog.java
index 690be78fdd9..aed92f7cf9d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockEventLog.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockEventLog.java
@@ -16,14 +16,13 @@
 
 package com.palantir.atlasdb.timelock.lock.watch;
 
-import java.util.OptionalLong;
-import java.util.Set;
-import java.util.UUID;
-
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.watch.LockWatchRequest;
 import com.palantir.lock.watch.LockWatchStateUpdate;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.UUID;
 
 public interface LockEventLog {
     LockWatchStateUpdate getLogDiff(OptionalLong fromVersion);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockEventLogImpl.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockEventLogImpl.java
index a595a3477a3..9bfb1863ca0 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockEventLogImpl.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockEventLogImpl.java
@@ -16,12 +16,6 @@
 
 package com.palantir.atlasdb.timelock.lock.watch;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalLong;
-import java.util.Set;
-import java.util.UUID;
-
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.watch.LockEvent;
@@ -31,6 +25,11 @@
 import com.palantir.lock.watch.LockWatchRequest;
 import com.palantir.lock.watch.LockWatchStateUpdate;
 import com.palantir.lock.watch.UnlockEvent;
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.UUID;
 
 public class LockEventLogImpl implements LockEventLog {
     private final UUID leaderId = UUID.randomUUID();
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchTestRuntimeConfig.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchTestRuntimeConfig.java
index 17df3ff82df..7cb4cc0365e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchTestRuntimeConfig.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchTestRuntimeConfig.java
@@ -16,16 +16,14 @@
 
 package com.palantir.atlasdb.timelock.lock.watch;
 
-import java.util.Optional;
-import java.util.Set;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import java.util.Optional;
+import java.util.Set;
+import org.immutables.value.Value;
 
 @JsonSerialize(as = ImmutableLockWatchTestRuntimeConfig.class)
 @JsonDeserialize(as = ImmutableLockWatchTestRuntimeConfig.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchTestingService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchTestingService.java
index c35be220bce..bd140196ade 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchTestingService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchTestingService.java
@@ -16,19 +16,6 @@
 
 package com.palantir.atlasdb.timelock.lock.watch;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalLong;
-import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.lock.watch.LockEvent;
@@ -40,6 +27,17 @@
 import com.palantir.lock.watch.LockWatchStateUpdate;
 import com.palantir.lock.watch.UnlockEvent;
 import com.palantir.logsafe.SafeArg;
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LockWatchTestingService {
     private static final Logger log = LoggerFactory.getLogger(LockWatchTestingService.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingResource.java
index 76d0ad98943..ec36ff0765c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingResource.java
@@ -16,17 +16,15 @@
 
 package com.palantir.atlasdb.timelock.lock.watch;
 
+import com.palantir.lock.watch.LockWatchRequest;
+import com.palantir.lock.watch.LockWatchStateUpdate;
 import java.util.OptionalLong;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.lock.watch.LockWatchRequest;
-import com.palantir.lock.watch.LockWatchStateUpdate;
-
 @Path("/lock-watch")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingService.java
index e520a88db2b..7e0dfdd97be 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingService.java
@@ -16,13 +16,12 @@
 
 package com.palantir.atlasdb.timelock.lock.watch;
 
-import java.util.OptionalLong;
-import java.util.Set;
-
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.watch.LockWatchRequest;
 import com.palantir.lock.watch.LockWatchStateUpdate;
+import java.util.OptionalLong;
+import java.util.Set;
 
 public interface LockWatchingService {
     void startWatching(LockWatchRequest locksToWatch);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingServiceImpl.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingServiceImpl.java
index 9b0977fc46a..306a7361d1e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingServiceImpl.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingServiceImpl.java
@@ -16,13 +16,6 @@
 
 package com.palantir.atlasdb.timelock.lock.watch;
 
-import java.util.List;
-import java.util.OptionalLong;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeSet;
@@ -33,6 +26,12 @@
 import com.palantir.lock.watch.LockWatchReferences;
 import com.palantir.lock.watch.LockWatchRequest;
 import com.palantir.lock.watch.LockWatchStateUpdate;
+import java.util.List;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 public class LockWatchingServiceImpl implements LockWatchingService {
     private final LockEventLog lockEventLog;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunction.java
index d5ba04e0699..690a7bc9a98 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunction.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.SetMultimap;
 import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.BooleanPaxosResponse;
 import com.palantir.paxos.PaxosProposal;
+import java.util.Map;
+import java.util.Set;
 
 final class AcceptCoalescingFunction implements
         CoalescingRequestFunction<Map.Entry<Client, PaxosProposal>, BooleanPaxosResponse> {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheDigest.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheDigest.java
index e417c76de64..02e43f77a5c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheDigest.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheDigest.java
@@ -16,12 +16,10 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.Map;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonDeserialize(as = ImmutableAcceptorCacheDigest.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImpl.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImpl.java
index 16ec7c07e4e..881c03a192c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImpl.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImpl.java
@@ -16,6 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.google.common.collect.Maps;
+import com.google.common.collect.TreeMultimap;
+import com.palantir.common.streams.KeyedStream;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Comparator;
@@ -26,16 +31,9 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.GuardedBy;
 
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.google.common.collect.Maps;
-import com.google.common.collect.TreeMultimap;
-import com.palantir.common.streams.KeyedStream;
-
 public class AcceptorCacheImpl implements AcceptorCache {
 
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheKey.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheKey.java
index 29b3080a72b..ba646ac316e 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheKey.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheKey.java
@@ -16,13 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.UUID;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.UUID;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonDeserialize(as = ImmutableAcceptorCacheKey.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatcherExecutionExceptions.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatcherExecutionExceptions.java
index 8174aada339..624e31e598c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatcherExecutionExceptions.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatcherExecutionExceptions.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.concurrent.ExecutionException;
-
 import com.palantir.logsafe.Preconditions;
+import java.util.concurrent.ExecutionException;
 
 class AutobatcherExecutionExceptions {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingLeadershipObserverFactory.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingLeadershipObserverFactory.java
index e25eaf441ee..e314ba3e951 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingLeadershipObserverFactory.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingLeadershipObserverFactory.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.io.Closeable;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-
 import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
 import com.palantir.atlasdb.autobatch.Autobatchers;
@@ -28,6 +23,10 @@
 import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.leader.LeadershipObserver;
+import java.io.Closeable;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
 
 public final class AutobatchingLeadershipObserverFactory implements Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosAcceptorNetworkClientFactory.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosAcceptorNetworkClientFactory.java
index 3b6e2455320..c90c12c8432 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosAcceptorNetworkClientFactory.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosAcceptorNetworkClientFactory.java
@@ -18,12 +18,6 @@
 
 import static com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.wrap;
 
-import java.io.Closeable;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.autobatch.Autobatchers;
 import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
@@ -35,6 +29,11 @@
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
 import com.palantir.paxos.PaxosResponses;
+import java.io.Closeable;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 
 public class AutobatchingPaxosAcceptorNetworkClientFactory implements Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosLearnerNetworkClientFactory.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosLearnerNetworkClientFactory.java
index efbfe09d087..a4ab97a81b6 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosLearnerNetworkClientFactory.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPaxosLearnerNetworkClientFactory.java
@@ -18,13 +18,6 @@
 
 import static com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.wrap;
 
-import java.io.Closeable;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.autobatch.Autobatchers;
 import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
@@ -35,6 +28,12 @@
 import com.palantir.paxos.PaxosResponses;
 import com.palantir.paxos.PaxosUpdate;
 import com.palantir.paxos.PaxosValue;
+import java.io.Closeable;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
 
 public class AutobatchingPaxosLearnerNetworkClientFactory implements Closeable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactory.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactory.java
index c0ed36c956c..7d89db0fa8d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactory.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactory.java
@@ -16,6 +16,13 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.palantir.atlasdb.autobatch.Autobatchers;
+import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.paxos.LeaderPingResult;
+import com.palantir.paxos.LeaderPingResults;
+import com.palantir.paxos.LeaderPinger;
+import com.palantir.paxos.LeaderPingerContext;
 import java.io.Closeable;
 import java.io.IOException;
 import java.time.Duration;
@@ -29,19 +36,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
-
 import org.immutables.value.Value;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.palantir.atlasdb.autobatch.Autobatchers;
-import com.palantir.atlasdb.autobatch.DisruptorAutobatcher;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.paxos.LeaderPingResult;
-import com.palantir.paxos.LeaderPingResults;
-import com.palantir.paxos.LeaderPinger;
-import com.palantir.paxos.LeaderPingerContext;
-
 public class AutobatchingPingableLeaderFactory implements Closeable {
 
     private static final Logger log = LoggerFactory.getLogger(AutobatchingPingableLeaderFactory.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptor.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptor.java
index 83e7e06831b..314db9661fc 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptor.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptor.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Optional;
-import java.util.Set;
-
 import com.google.common.collect.SetMultimap;
 import com.palantir.paxos.BooleanPaxosResponse;
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.Optional;
+import java.util.Set;
 
 public interface BatchPaxosAcceptor {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResource.java
index e33439efdaf..2e2caa510e3 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResource.java
@@ -18,9 +18,15 @@
 
 import static com.palantir.atlasdb.timelock.paxos.BatchPaxosAcceptorRpcClient.CACHE_KEY_NOT_FOUND;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.conjure.java.api.errors.ServiceException;
+import com.palantir.logsafe.SafeArg;
+import com.palantir.paxos.BooleanPaxosResponse;
+import com.palantir.paxos.PaxosPromise;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -28,18 +34,9 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.conjure.java.api.errors.ServiceException;
-import com.palantir.logsafe.SafeArg;
-import com.palantir.paxos.BooleanPaxosResponse;
-import com.palantir.paxos.PaxosPromise;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-
 @Path("/" + PaxosTimeLockConstants.BATCH_INTERNAL_NAMESPACE
         + "/acceptor")
 public class BatchPaxosAcceptorResource {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorRpcClient.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorRpcClient.java
index 4c85ec51463..5da4afd54bf 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorRpcClient.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorRpcClient.java
@@ -16,9 +16,15 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.conjure.java.api.errors.ErrorType;
+import com.palantir.paxos.BooleanPaxosResponse;
+import com.palantir.paxos.PaxosAcceptor;
+import com.palantir.paxos.PaxosPromise;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -29,14 +35,6 @@
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.conjure.java.api.errors.ErrorType;
-import com.palantir.paxos.BooleanPaxosResponse;
-import com.palantir.paxos.PaxosAcceptor;
-import com.palantir.paxos.PaxosPromise;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE
         + "/{useCase}"
         + "/" + PaxosTimeLockConstants.BATCH_INTERNAL_NAMESPACE
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearner.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearner.java
index 310c1b5779f..27ba1f5391d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearner.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearner.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.SetMultimap;
 import com.palantir.paxos.PaxosLearner;
 import com.palantir.paxos.PaxosValue;
+import java.util.Map;
+import java.util.Set;
 
 public interface BatchPaxosLearner {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResource.java
index f1f11ae387f..1c6eacdcc2c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerResource.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosValue;
 import java.util.Map;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosValue;
-
 @Path("/" + PaxosTimeLockConstants.BATCH_INTERNAL_NAMESPACE
         + "/learner")
 public class BatchPaxosLearnerResource {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerRpcClient.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerRpcClient.java
index e57990ff41c..d1ad45bc262 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerRpcClient.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosLearnerRpcClient.java
@@ -16,9 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosLearner;
+import com.palantir.paxos.PaxosValue;
 import java.util.Map;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -26,10 +28,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosLearner;
-import com.palantir.paxos.PaxosValue;
-
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE
         + "/{useCase}"
         + "/" + PaxosTimeLockConstants.BATCH_INTERNAL_NAMESPACE
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeader.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeader.java
index aa5efe1102e..c2b3e0b8c44 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeader.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeader.java
@@ -16,17 +16,15 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.palantir.leader.PingableLeader;
 import java.util.Set;
 import java.util.UUID;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.leader.PingableLeader;
-
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE
         + "/" + PaxosTimeLockConstants.MULTI_LEADER_PAXOS_NAMESPACE
         + "/" + PaxosTimeLockConstants.BATCH_INTERNAL_NAMESPACE
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResource.java
index c2fe5a32af8..5d3ac979c10 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResource.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.PaxosLearner;
+import com.palantir.paxos.PaxosValue;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.PaxosLearner;
-import com.palantir.paxos.PaxosValue;
-
 public class BatchPingableLeaderResource implements BatchPingableLeader {
 
     private final UUID leadershipUuid;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCache.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCache.java
index 675c6bd2ff5..181b8945034 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCache.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCache.java
@@ -16,23 +16,20 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.PaxosLong;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.PaxosLong;
-
 /*
     This is not thread safe, but it is okay because it is run within an autobatcher, which is configured to not process
     multiple batches in parallel.
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/Client.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/Client.java
index e9d962ae1cb..938183e8e00 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/Client.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/Client.java
@@ -16,16 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.BitSet;
-
-import org.immutables.value.Value;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
+import java.util.BitSet;
+import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonDeserialize(as = ImmutableClient.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientAwarePingableLeader.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientAwarePingableLeader.java
index 11f0ef6a4b3..fd39c04efa4 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientAwarePingableLeader.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientAwarePingableLeader.java
@@ -16,11 +16,10 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.io.Closeable;
-import java.util.UUID;
-
 import com.palantir.paxos.LeaderPingResult;
 import com.palantir.paxos.LeaderPingerContext;
+import java.io.Closeable;
+import java.util.UUID;
 
 interface ClientAwarePingableLeader extends Closeable {
     LeaderPingResult ping(UUID requestedUuid, Client client);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientScopedMetrics.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientScopedMetrics.java
index 8410f2e47cf..b724c9b1968 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientScopedMetrics.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/ClientScopedMetrics.java
@@ -16,10 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.AtlasDbMetricNames;
@@ -28,6 +24,9 @@
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.SlidingWindowTaggedMetricRegistry;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
 
 public class ClientScopedMetrics {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/GetSuspectedLeaderWithUuid.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/GetSuspectedLeaderWithUuid.java
index 65a63d471c3..3bbf2b0f208 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/GetSuspectedLeaderWithUuid.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/GetSuspectedLeaderWithUuid.java
@@ -18,21 +18,6 @@
 
 import static java.util.stream.Collectors.toSet;
 
-import java.time.Duration;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Consumer;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
@@ -48,6 +33,18 @@
 import com.palantir.paxos.LeaderPingerContext;
 import com.palantir.paxos.PaxosQuorumChecker;
 import com.palantir.paxos.PaxosResponsesWithRemote;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Consumer;
+import javax.annotation.concurrent.NotThreadSafe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
     This is not thread safe, but it is okay because it is run within an autobatcher, which is configured to not process
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/InvalidAcceptorCacheKeyException.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/InvalidAcceptorCacheKeyException.java
index 4eefca8ce4c..8c5c77120ac 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/InvalidAcceptorCacheKeyException.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/InvalidAcceptorCacheKeyException.java
@@ -16,12 +16,11 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.SafeLoggable;
+import java.util.List;
 
 public class InvalidAcceptorCacheKeyException extends Exception implements SafeLoggable {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipResource.java
index 09f4e8f4b57..d2f8806a748 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LeadershipResource.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.timelock.paxos;
 
-import javax.ws.rs.Path;
-
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosLearner;
+import javax.ws.rs.Path;
 
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE
         + "/" + PaxosTimeLockConstants.LEADER_PAXOS_NAMESPACE)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumer.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumer.java
index 051f8bba260..8f19bd14f9d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumer.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumer.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
@@ -31,6 +23,12 @@
 import com.palantir.paxos.PaxosResponse;
 import com.palantir.paxos.PaxosResponseImpl;
 import com.palantir.paxos.PaxosValue;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class LearnCoalescingConsumer implements CoalescingRequestFunction<Map.Entry<Client, PaxosValue>, PaxosResponse> {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunction.java
index 86ff5796ad8..26ffef55b82 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunction.java
@@ -16,16 +16,15 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
 import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
 import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
 import com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.PaxosContainer;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.PaxosValue;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 final class LearnedValuesCoalescingFunction implements
         CoalescingRequestFunction<WithSeq<Client>, PaxosContainer<Optional<PaxosValue>>> {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunction.java
index 178121b5f5a..e18246fbd44 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunction.java
@@ -16,14 +16,8 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import static java.util.stream.Collectors.toMap;
-
 import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.Set;
+import static java.util.stream.Collectors.toMap;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedMap;
@@ -32,6 +26,10 @@
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.PaxosUpdate;
 import com.palantir.paxos.PaxosValue;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Set;
 
 final class LearnedValuesSinceCoalescingFunction
         implements CoalescingRequestFunction<WithSeq<Client>, PaxosUpdate> {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalAndRemotes.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalAndRemotes.java
index 362c58ce538..60143799bad 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalAndRemotes.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalAndRemotes.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.immutables.value.Value;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
 @Value.Immutable
 interface LocalAndRemotes<T> {
     @Value.Parameter
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptor.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptor.java
index 71ea17e42b7..ed7f73b63fe 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptor.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptor.java
@@ -18,12 +18,6 @@
 
 import static java.util.stream.Collectors.toSet;
 
-import java.util.Optional;
-import java.util.Set;
-
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.HttpHeaders;
-
 import com.google.common.collect.SetMultimap;
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.BooleanPaxosResponse;
@@ -31,6 +25,10 @@
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.Optional;
+import java.util.Set;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.HttpHeaders;
 
 public class LocalBatchPaxosAcceptor implements BatchPaxosAcceptor {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosLearner.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosLearner.java
index 2935f78e639..03322e855e8 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosLearner.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosLearner.java
@@ -16,15 +16,14 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.PaxosValue;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.PaxosValue;
-
 public class LocalBatchPaxosLearner implements BatchPaxosLearner {
 
     private final LocalPaxosComponents paxosComponents;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalPaxosComponents.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalPaxosComponents.java
index 9d2eb93dbef..a2582a515b2 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalPaxosComponents.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/LocalPaxosComponents.java
@@ -15,14 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Map;
-import java.util.UUID;
-import java.util.function.Supplier;
-
-import org.immutables.value.Value;
-
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Maps;
 import com.palantir.leader.LocalPingableLeader;
@@ -31,6 +23,12 @@
 import com.palantir.paxos.PaxosAcceptorImpl;
 import com.palantir.paxos.PaxosLearner;
 import com.palantir.paxos.PaxosLearnerImpl;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Supplier;
+import org.immutables.value.Value;
 
 public class LocalPaxosComponents {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunction.java
index a2f70f900ec..8da6995d7db 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunction.java
@@ -22,15 +22,6 @@
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
-
-import org.immutables.value.Value;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
@@ -40,6 +31,13 @@
 import com.palantir.paxos.PaxosResponse;
 import com.palantir.paxos.PaxosResponses;
 import com.palantir.paxos.PaxosResponsesWithRemote;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
+import org.immutables.value.Value;
 
 public class PaxosQuorumCheckingCoalescingFunction<
         REQ, RESP extends PaxosResponse, FUNC extends CoalescingRequestFunction<REQ, RESP>> implements
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStore.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStore.java
index c9700c9d744..6574c3e2a1d 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStore.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStore.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-
-import org.immutables.value.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Ordering;
@@ -47,6 +37,13 @@
 import com.palantir.timestamp.DebugLogger;
 import com.palantir.timestamp.MultipleRunningTimestampServiceError;
 import com.palantir.timestamp.TimestampBoundStore;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+import org.immutables.value.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PaxosTimestampBoundStore implements TimestampBoundStore {
     private static final Logger log = LoggerFactory.getLogger(PaxosTimestampBoundStore.class);
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosUseCase.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosUseCase.java
index 65f3bde3569..77841f8d70c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosUseCase.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PaxosUseCase.java
@@ -20,11 +20,10 @@
 import static com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants.LEADER_PAXOS_NAMESPACE;
 import static com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants.MULTI_LEADER_PAXOS_NAMESPACE;
 
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-
 public enum PaxosUseCase {
 
     // <data-directory>/<client="leaderPaxos">/{acceptor/learner}
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunction.java
index 3e5044076ed..ac5e7befa86 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunction.java
@@ -16,16 +16,15 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.autobatch.CoalescingRequestFunction;
 import com.palantir.atlasdb.timelock.paxos.AutobatchingPingableLeaderFactory.PingRequest;
 import com.palantir.paxos.LeaderPingResult;
 import com.palantir.paxos.LeaderPingResults;
 import com.palantir.paxos.LeaderPingerContext;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 final class PingCoalescingFunction implements CoalescingRequestFunction<PingRequest, LeaderPingResult> {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunction.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunction.java
index 99250dc5716..366fe739e38 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunction.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunction.java
@@ -16,9 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.Map;
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
@@ -26,6 +23,8 @@
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.Map;
+import java.util.Set;
 
 final class PrepareCoalescingFunction implements
         CoalescingRequestFunction<Map.Entry<Client, WithSeq<PaxosProposalId>>, PaxosPromise> {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockPaxosMetrics.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockPaxosMetrics.java
index f99b77d124c..5ba0b9498f0 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockPaxosMetrics.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/TimelockPaxosMetrics.java
@@ -16,12 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbMetricNames;
@@ -30,6 +24,10 @@
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.tritium.metrics.registry.SlidingWindowTaggedMetricRegistry;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public abstract class TimelockPaxosMetrics {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/TimestampPaxosResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/TimestampPaxosResource.java
index aee863ebb6a..67af2a98c33 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/TimestampPaxosResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/TimestampPaxosResource.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.paxos;
 
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosLearner;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 
 @Path("/" + PaxosTimeLockConstants.INTERNAL_NAMESPACE
         + "/" + PaxosTimeLockConstants.CLIENT_PAXOS_NAMESPACE
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosAcceptorAdapter.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosAcceptorAdapter.java
index f42be974d3f..6d2a63966f8 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosAcceptorAdapter.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosAcceptorAdapter.java
@@ -18,20 +18,18 @@
 
 import static com.palantir.atlasdb.timelock.paxos.BatchPaxosAcceptorRpcClient.CACHE_KEY_NOT_FOUND;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.SetMultimap;
 import com.palantir.conjure.java.api.errors.RemoteException;
 import com.palantir.paxos.BooleanPaxosResponse;
 import com.palantir.paxos.PaxosPromise;
 import com.palantir.paxos.PaxosProposal;
 import com.palantir.paxos.PaxosProposalId;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class UseCaseAwareBatchPaxosAcceptorAdapter implements BatchPaxosAcceptor {
 
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosLearnerAdapter.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosLearnerAdapter.java
index 72ab5c95259..c8cdd4a99f5 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosLearnerAdapter.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosLearnerAdapter.java
@@ -16,14 +16,13 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosValue;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosValue;
-
 public class UseCaseAwareBatchPaxosLearnerAdapter implements BatchPaxosLearner {
 
     private final PaxosUseCase useCase;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosResource.java
index a3da856c52f..63720b6ef75 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosResource.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/UseCaseAwareBatchPaxosResource.java
@@ -17,7 +17,6 @@
 package com.palantir.atlasdb.timelock.paxos;
 
 import java.util.EnumMap;
-
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/WithSeq.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/WithSeq.java
index e838ae04f8a..b1ee36b3cb2 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/WithSeq.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/paxos/WithSeq.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-
 import org.immutables.value.Value;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 @Value.Immutable
 @JsonDeserialize(as = ImmutableWithSeq.class)
 @JsonSerialize(as = ImmutableWithSeq.class)
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocator.java
index 70fab8065d7..5f7f7eb7da0 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocator.java
@@ -16,18 +16,17 @@
 
 package com.palantir.atlasdb.timelock.transaction.client;
 
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ForkJoinPool;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.github.benmanes.caffeine.cache.RemovalCause;
 import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ForkJoinPool;
 
 public class CachingPartitionAllocator<T> implements NumericPartitionAllocator<T> {
     private final LoadingCache<T, Integer> loadingCache;
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGenerator.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGenerator.java
index 10f63d85f3e..394e6326017 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGenerator.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGenerator.java
@@ -16,18 +16,16 @@
 
 package com.palantir.atlasdb.timelock.transaction.client;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.util.Comparator;
 import java.util.SortedSet;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.immutables.value.Value;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-
 /**
  * Distributes residues of a given modulus in a balanced fashion (though we don't automatically rebalance between
  * residues).
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/ClientAwareManagedTimestampService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/ClientAwareManagedTimestampService.java
index 7b9c37eba8b..b370cdda2be 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/ClientAwareManagedTimestampService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/ClientAwareManagedTimestampService.java
@@ -16,10 +16,9 @@
 
 package com.palantir.atlasdb.timelock.transaction.timestamp;
 
-import java.util.UUID;
-
 import com.palantir.lock.v2.PartitionedTimestamps;
 import com.palantir.timestamp.ManagedTimestampService;
+import java.util.UUID;
 
 /**
  * Like {@link com.palantir.timestamp.TimestampService}, but may provide timestamps that are tailored to client
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampService.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampService.java
index 1ec6ef309b2..6f1f62f9b96 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampService.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampService.java
@@ -16,11 +16,6 @@
 
 package com.palantir.atlasdb.timelock.transaction.timestamp;
 
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.atlasdb.timelock.transaction.client.CachingPartitionAllocator;
 import com.palantir.atlasdb.timelock.transaction.client.NumericPartitionAllocator;
@@ -31,6 +26,9 @@
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampRange;
 import com.palantir.timestamp.TimestampRanges;
+import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DelegatingClientAwareManagedTimestampService
         implements AutoDelegate_ManagedTimestampService, ClientAwareManagedTimestampService {
diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/util/LoggableIllegalStateException.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/util/LoggableIllegalStateException.java
index 79282138f5c..fdc12c3d92c 100644
--- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/util/LoggableIllegalStateException.java
+++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/util/LoggableIllegalStateException.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.util;
 
-import java.util.List;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.logsafe.Arg;
 import com.palantir.logsafe.SafeLoggable;
+import java.util.List;
 
 // TODO(nziebart): replace this when http-remoting provides a similar class
 public class LoggableIllegalStateException extends IllegalStateException implements SafeLoggable {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImplTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImplTest.java
index 26949775cfd..a881168c59b 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImplTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceImplTest.java
@@ -20,10 +20,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.timelock.lock.AsyncLockService;
 import com.palantir.timestamp.ManagedTimestampService;
+import org.junit.Test;
 
 public class AsyncTimelockServiceImplTest {
     @Test
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/TimeLockResourceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/TimeLockResourceTest.java
index 785839370e7..e2cbd7778cd 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/TimeLockResourceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/TimeLockResourceTest.java
@@ -24,18 +24,16 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.codahale.metrics.MetricRegistry;
+import com.palantir.atlasdb.util.MetricsManager;
+import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
 import java.util.function.Supplier;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.codahale.metrics.MetricRegistry;
-import com.palantir.atlasdb.util.MetricsManager;
-import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
-
 public class TimeLockResourceTest {
     private static final String CLIENT_A = "a-client";
     private static final String CLIENT_B = "b-client";
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/PrivilegesConfigurationTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/PrivilegesConfigurationTest.java
index 2743903cff7..0233e944909 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/PrivilegesConfigurationTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/PrivilegesConfigurationTest.java
@@ -18,17 +18,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.lock.TimelockNamespace;
+import java.io.File;
+import java.io.IOException;
+import org.junit.Test;
 
 public class PrivilegesConfigurationTest {
     private static final String ADMIN_PRIVILEGES_CONFIG = "admin-privileges-config";
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfigurationTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfigurationTest.java
index 18278e9dd73..5f896e5aecd 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfigurationTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/config/TimelockAuthConfigurationTest.java
@@ -19,11 +19,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
@@ -33,6 +28,9 @@
 import com.palantir.atlasdb.timelock.auth.api.Credentials;
 import com.palantir.atlasdb.timelock.auth.api.ImmutableCredentials;
 import com.palantir.lock.TimelockNamespace;
+import java.io.File;
+import java.io.IOException;
+import org.junit.Test;
 
 public class TimelockAuthConfigurationTest {
     private static final String TIMELOCK_AUTH_CONFIG = "timelock-auth-config";
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticatorTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticatorTest.java
index e94f4551a5e..abdd96a0824 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticatorTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/CachingAuthenticatorTest.java
@@ -18,17 +18,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mindrot.jbcrypt.BCrypt;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
 import com.palantir.atlasdb.timelock.auth.api.Authenticator;
 import com.palantir.atlasdb.timelock.auth.api.BCryptedSecret;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Password;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mindrot.jbcrypt.BCrypt;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class CachingAuthenticatorTest {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLockerTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLockerTest.java
index e0cd4cac68e..32d6ba1e21e 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLockerTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/PrivilegeBasedNamespaceLockerTest.java
@@ -18,14 +18,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Map;
-
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.timelock.auth.api.ClientId;
 import com.palantir.atlasdb.timelock.auth.api.Privileges;
 import com.palantir.lock.TimelockNamespace;
+import java.util.Map;
+import org.junit.Test;
 
 public class PrivilegeBasedNamespaceLockerTest {
     private static final ClientId AUTHENTICATED_CLIENT = ClientId.of("user");
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizerTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizerTest.java
index 312a1ccf740..fbf6db36e4b 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizerTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/auth/impl/SimpleAuthorizerTest.java
@@ -19,19 +19,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
+import com.palantir.atlasdb.timelock.auth.api.ClientId;
+import com.palantir.atlasdb.timelock.auth.api.Privileges;
+import com.palantir.lock.TimelockNamespace;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.palantir.atlasdb.timelock.auth.api.AuthenticatedClient;
-import com.palantir.atlasdb.timelock.auth.api.ClientId;
-import com.palantir.atlasdb.timelock.auth.api.Privileges;
-import com.palantir.lock.TimelockNamespace;
-
 @RunWith(MockitoJUnitRunner.class)
 public class SimpleAuthorizerTest {
     private static final TimelockNamespace NAMESPACE_1 = TimelockNamespace.of("namespace_1");
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfigTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfigTests.java
index 88320de3d1b..d47046dc7b6 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfigTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/config/TargetedSweepLockControlConfigTests.java
@@ -18,9 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.timelock.config.TargetedSweepLockControlConfig.Mode;
+import org.junit.Test;
 
 public class TargetedSweepLockControlConfigTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
index 5d2e2d01306..4216bb3b320 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
@@ -18,15 +18,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
 import com.palantir.atlasdb.timelock.config.ImmutableRateLimitConfig;
 import com.palantir.atlasdb.timelock.config.TargetedSweepLockControlConfig;
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.common.concurrent.PTExecutors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Supplier;
+import org.junit.Test;
 
 public class AsyncLockServiceTest {
     private static final Supplier<TargetedSweepLockControlConfig.RateLimitConfig> RATE_LIMIT_CONFIG_SUPPLIER
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollectionTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollectionTest.java
index cb0d281292f..1b0683d1934 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollectionTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/AwaitedLocksCollectionTest.java
@@ -27,7 +27,6 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
 import org.awaitility.Awaitility;
 import org.awaitility.Duration;
 import org.junit.Test;
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockServiceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockServiceTest.java
index 61267c63755..40f1f767ff0 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockServiceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/BlockingTimeLimitedLockServiceTest.java
@@ -24,12 +24,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.util.concurrent.FakeTimeLimiter;
 import com.google.common.util.concurrent.TimeLimiter;
@@ -39,6 +33,10 @@
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.lock.remoting.BlockingTimeoutException;
+import java.io.IOException;
+import java.util.concurrent.TimeoutException;
+import org.junit.Before;
+import org.junit.Test;
 
 public class BlockingTimeLimitedLockServiceTest {
     private static final long BLOCKING_TIME_LIMIT_MILLIS = 10L;
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLockTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLockTests.java
index 7d037899dc5..38ece349cca 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLockTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepAsyncLockTests.java
@@ -19,16 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.assertj.core.data.Offset;
-import org.junit.After;
-import org.junit.Test;
-
 import com.codahale.metrics.Meter;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -37,6 +27,14 @@
 import com.google.common.util.concurrent.RateLimiter;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.util.Pair;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.assertj.core.data.Offset;
+import org.junit.After;
+import org.junit.Test;
 
 public class TargetedSweepAsyncLockTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecoratorTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecoratorTests.java
index 0f7ee9e82e0..8eaf729e466 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecoratorTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/TargetedSweepLockDecoratorTests.java
@@ -19,15 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.stream.Collectors;
-
-import org.junit.After;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.sweep.queue.ShardAndStrategy;
@@ -35,6 +26,13 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.util.Pair;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.stream.Collectors;
+import org.junit.After;
+import org.junit.Test;
 
 public class TargetedSweepLockDecoratorTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/ThreadPooledLockServiceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/ThreadPooledLockServiceTest.java
index 16353e8e23c..3cd1cb5ad83 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/ThreadPooledLockServiceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/ThreadPooledLockServiceTest.java
@@ -18,14 +18,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+import com.palantir.lock.CloseableLockService;
+import com.palantir.lock.impl.ThreadPooledLockService;
 import java.io.IOException;
 import java.util.concurrent.Semaphore;
-
 import org.junit.Test;
 
-import com.palantir.lock.CloseableLockService;
-import com.palantir.lock.impl.ThreadPooledLockService;
-
 public class ThreadPooledLockServiceTest {
 
     @Test
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/watch/ArrayLockEventSlidingWindowTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/watch/ArrayLockEventSlidingWindowTest.java
index 71be33f3c98..a429a6ee3c5 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/watch/ArrayLockEventSlidingWindowTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/watch/ArrayLockEventSlidingWindowTest.java
@@ -18,17 +18,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.lock.watch.LockWatchEvent;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
-
 import org.immutables.value.Value;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.lock.watch.LockWatchEvent;
-
 public class ArrayLockEventSlidingWindowTest {
     private final ArrayLockEventSlidingWindow slidingWindow = new ArrayLockEventSlidingWindow(10);
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingServiceImplTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingServiceImplTest.java
index 6c2afe173fe..114e4eecd2b 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingServiceImplTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/lock/watch/LockWatchingServiceImplTest.java
@@ -25,13 +25,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.Set;
-import java.util.UUID;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -47,6 +40,11 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.watch.LockWatchRequest;
+import java.util.Set;
+import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 public class LockWatchingServiceImplTest {
     private static final TableReference TABLE = TableReference.createFromFullyQualifiedName("test.table");
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunctionTests.java
index 5fb235f9c99..97d1a47c6f6 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptCoalescingFunctionTests.java
@@ -20,22 +20,20 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.BooleanPaxosResponse;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
+import com.palantir.paxos.PaxosValue;
 import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.BooleanPaxosResponse;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class AcceptCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImplTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImplTests.java
index 14688e57a6e..60cb45147b3 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImplTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AcceptorCacheImplTests.java
@@ -20,16 +20,14 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.entry;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.common.streams.KeyedStream;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.palantir.common.streams.KeyedStream;
-
 public class AcceptorCacheImplTests {
 
     @Test
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactoryTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactoryTests.java
index 073d799fe67..c95da500f38 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactoryTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/AutobatchingPingableLeaderFactoryTests.java
@@ -23,16 +23,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.junit.After;
-import org.junit.Test;
-import org.mockito.Answers;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -41,6 +31,14 @@
 import com.palantir.paxos.LeaderPingResults;
 import com.palantir.paxos.LeaderPinger;
 import com.palantir.paxos.LeaderPingerContext;
+import java.time.Duration;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.junit.After;
+import org.junit.Test;
+import org.mockito.Answers;
 
 public class AutobatchingPingableLeaderFactoryTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResourceTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResourceTests.java
index f7aa08dfd1f..427c5b73672 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResourceTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPaxosAcceptorResourceTests.java
@@ -16,20 +16,17 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import static org.mockito.Mockito.when;
-
 import static com.palantir.conjure.java.api.testing.Assertions.assertThatServiceExceptionThrownBy;
+import static org.mockito.Mockito.when;
 
+import com.palantir.logsafe.SafeArg;
 import java.util.Optional;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.palantir.logsafe.SafeArg;
-
 @RunWith(MockitoJUnitRunner.class)
 public class BatchPaxosAcceptorResourceTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResourceTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResourceTests.java
index b0462e54d9b..334f19e4faa 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResourceTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchPingableLeaderResourceTests.java
@@ -19,10 +19,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
+import com.palantir.paxos.PaxosValue;
 import java.util.Optional;
 import java.util.Random;
 import java.util.UUID;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,9 +31,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class BatchPingableLeaderResourceTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCacheTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCacheTests.java
index 84cc1de39a2..918a95dec1b 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCacheTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/BatchingPaxosLatestSequenceCacheTests.java
@@ -23,20 +23,18 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.ImmutablePaxosLong;
+import com.palantir.paxos.PaxosLong;
 import java.util.Map;
 import java.util.Optional;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.ImmutablePaxosLong;
-import com.palantir.paxos.PaxosLong;
-
 @RunWith(MockitoJUnitRunner.class)
 public class BatchingPaxosLatestSequenceCacheTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/GetSuspectedLeaderWithUuidTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/GetSuspectedLeaderWithUuidTests.java
index 006833ad8c8..a296c8f829c 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/GetSuspectedLeaderWithUuidTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/GetSuspectedLeaderWithUuidTests.java
@@ -24,6 +24,12 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.SettableFuture;
+import com.palantir.atlasdb.autobatch.BatchElement;
+import com.palantir.paxos.LeaderPingerContext;
 import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
@@ -35,19 +41,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
-
 import org.immutables.value.Value;
 import org.junit.After;
 import org.junit.Test;
 import org.mockito.Answers;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.SettableFuture;
-import com.palantir.atlasdb.autobatch.BatchElement;
-import com.palantir.paxos.LeaderPingerContext;
-
 public class GetSuspectedLeaderWithUuidTests {
 
     private static final UUID LOCAL_UUID = UUID.randomUUID();
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumerTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumerTests.java
index 8b0f9277859..45cb73a9419 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumerTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnCoalescingConsumerTests.java
@@ -20,23 +20,21 @@
 import static org.awaitility.Awaitility.await;
 import static org.mockito.Mockito.verify;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosValue;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class LearnCoalescingConsumerTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunctionTests.java
index 1d1465d7297..f2ad1bdf0da 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesCoalescingFunctionTests.java
@@ -20,22 +20,20 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.PaxosContainer;
+import com.palantir.paxos.PaxosValue;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.PaxosContainer;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class LearnedValuesCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunctionTests.java
index 92567985f12..793c8f5224f 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LearnedValuesSinceCoalescingFunctionTests.java
@@ -19,25 +19,23 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.PaxosUpdate;
+import com.palantir.paxos.PaxosValue;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.PaxosUpdate;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class LearnedValuesSinceCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptorTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptorTests.java
index 1842c7a5348..7a700ee86ef 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptorTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosAcceptorTests.java
@@ -20,10 +20,17 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.BooleanPaxosResponse;
+import com.palantir.paxos.PaxosPromise;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
+import com.palantir.paxos.PaxosValue;
 import java.util.Optional;
 import java.util.Random;
 import java.util.UUID;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,15 +38,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.BooleanPaxosResponse;
-import com.palantir.paxos.PaxosPromise;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-import com.palantir.paxos.PaxosValue;
-
 @SuppressWarnings("unchecked")
 @RunWith(MockitoJUnitRunner.class)
 public class LocalBatchPaxosAcceptorTests {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosLearnerTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosLearnerTests.java
index f7f49887492..5ee5c0ba2b8 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosLearnerTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalBatchPaxosLearnerTests.java
@@ -21,11 +21,15 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosValue;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,12 +37,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosValue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class LocalBatchPaxosLearnerTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalPaxosComponentsTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalPaxosComponentsTest.java
index 4a91308d221..f812f2f9969 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalPaxosComponentsTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/LocalPaxosComponentsTest.java
@@ -17,24 +17,22 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.paxos.PaxosAcceptor;
+import com.palantir.paxos.PaxosLearner;
+import com.palantir.paxos.PaxosProposal;
+import com.palantir.paxos.PaxosProposalId;
+import com.palantir.paxos.PaxosValue;
+import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.UUID;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.palantir.paxos.PaxosAcceptor;
-import com.palantir.paxos.PaxosLearner;
-import com.palantir.paxos.PaxosProposal;
-import com.palantir.paxos.PaxosProposalId;
-import com.palantir.paxos.PaxosValue;
-import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
-
 public class LocalPaxosComponentsTest {
     private static final Client CLIENT = Client.of("alice");
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunctionTests.java
index 0a8a82a8101..64cd2ad0eb5 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosQuorumCheckingCoalescingFunctionTests.java
@@ -19,16 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -38,6 +28,14 @@
 import com.palantir.paxos.ImmutablePaxosLong;
 import com.palantir.paxos.PaxosLong;
 import com.palantir.paxos.PaxosResponsesWithRemote;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class PaxosQuorumCheckingCoalescingFunctionTests {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockUriUtilsTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockUriUtilsTest.java
index 32f067c24ba..a75d07a7deb 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockUriUtilsTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimeLockUriUtilsTest.java
@@ -17,12 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableSet;
 import java.util.Set;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-
 public class PaxosTimeLockUriUtilsTest {
     private static final String ADDRESS_1 = "foo:1234";
     private static final String ADDRESS_2 = "bar:5678";
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java
index 1c08ce111a8..814fde76538 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PaxosTimestampBoundStoreTest.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.timelock.paxos;
 
 import static java.util.stream.Collectors.toList;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
@@ -25,24 +24,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.annotation.Nullable;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -61,6 +42,21 @@
 import com.palantir.paxos.SingleLeaderAcceptorNetworkClient;
 import com.palantir.paxos.SingleLeaderLearnerNetworkClient;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nullable;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class PaxosTimestampBoundStoreTest {
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunctionTests.java
index defc42ab9b9..48d47eb5eb8 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PingCoalescingFunctionTests.java
@@ -16,25 +16,22 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
 import static com.palantir.paxos.LeaderPingResults.pingReturnedFalse;
 import static com.palantir.paxos.LeaderPingResults.pingReturnedTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.net.HostAndPort;
+import com.palantir.atlasdb.timelock.paxos.AutobatchingPingableLeaderFactory.PingRequest;
+import com.palantir.paxos.ImmutableLeaderPingerContext;
 import java.util.Set;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.net.HostAndPort;
-import com.palantir.atlasdb.timelock.paxos.AutobatchingPingableLeaderFactory.PingRequest;
-import com.palantir.paxos.ImmutableLeaderPingerContext;
-
 @RunWith(MockitoJUnitRunner.class)
 public class PingCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunctionTests.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunctionTests.java
index 1641ab1e8c8..1aa17d63021 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunctionTests.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/paxos/PrepareCoalescingFunctionTests.java
@@ -20,20 +20,18 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.SetMultimap;
+import com.palantir.paxos.PaxosPromise;
+import com.palantir.paxos.PaxosProposalId;
 import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.SetMultimap;
-import com.palantir.paxos.PaxosPromise;
-import com.palantir.paxos.PaxosProposalId;
-
 @RunWith(MockitoJUnitRunner.class)
 public class PrepareCoalescingFunctionTests {
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocatorTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocatorTest.java
index 8719c237be8..33e9f0b782d 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocatorTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/CachingPartitionAllocatorTest.java
@@ -23,18 +23,16 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.collect.Iterables;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.github.benmanes.caffeine.cache.Ticker;
-import com.google.common.collect.Iterables;
-
 public class CachingPartitionAllocatorTest {
     private static final String KEY = "foo";
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGeneratorTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGeneratorTest.java
index 96702a69794..a414649737a 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGeneratorTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/client/DistributingModulusGeneratorTest.java
@@ -20,16 +20,14 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Test;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
 public class DistributingModulusGeneratorTest {
     private DistributingModulusGenerator generator;
 
diff --git a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampServiceTest.java b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampServiceTest.java
index 9b0ccfc32d9..3e95523eca6 100644
--- a/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampServiceTest.java
+++ b/timelock-impl/src/test/java/com/palantir/atlasdb/timelock/transaction/timestamp/DelegatingClientAwareManagedTimestampServiceTest.java
@@ -25,17 +25,15 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-import java.util.UUID;
-
-import org.junit.After;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.timelock.transaction.client.NumericPartitionAllocator;
 import com.palantir.lock.v2.TimestampAndPartition;
 import com.palantir.timestamp.ManagedTimestampService;
 import com.palantir.timestamp.TimestampRange;
+import java.util.List;
+import java.util.UUID;
+import org.junit.After;
+import org.junit.Test;
 
 @SuppressWarnings("unchecked") // Mocks of parameterised types
 public class DelegatingClientAwareManagedTimestampServiceTest {
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksResource.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksResource.java
index 33035a43fb0..443ff151a57 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksResource.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksResource.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks;
 
-import java.util.Map;
-import java.util.Optional;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.factory.TransactionManagers;
@@ -37,6 +34,8 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.conjure.java.api.config.service.UserAgent;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
+import java.util.Map;
+import java.util.Optional;
 
 public class BenchmarksResource implements BenchmarksService {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksService.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksService.java
index c67fb3dc0db..435425f5ae6 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksService.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/BenchmarksService.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.timelock.benchmarks;
 
 import java.util.Map;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/TimelockBenchmarkClientLauncher.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/TimelockBenchmarkClientLauncher.java
index 2c02d84b6de..8b68a097247 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/TimelockBenchmarkClientLauncher.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/TimelockBenchmarkClientLauncher.java
@@ -22,7 +22,6 @@
 import com.palantir.atlasdb.timelock.logging.NonBlockingFileAppenderFactory;
 import com.palantir.conjure.java.server.jersey.ConjureJerseyFeature;
 import com.palantir.tritium.metrics.MetricRegistries;
-
 import io.dropwizard.Application;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractBenchmark.java
index 55fb5408b8d..8372b61af64 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractBenchmark.java
@@ -15,6 +15,9 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -23,14 +26,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLongArray;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-
 public abstract class AbstractBenchmark {
 
     private static final Logger log = LoggerFactory.getLogger(AbstractBenchmark.class);
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractRangeScanBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractRangeScanBenchmark.java
index c59adae00a8..fb8d598e5f1 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractRangeScanBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractRangeScanBenchmark.java
@@ -15,16 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
@@ -35,6 +25,14 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
 import com.palantir.logsafe.Preconditions;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A base class for implementing range scan benchmarks. A primary function of this class is to store metadata
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractWriteTransactionBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractWriteTransactionBenchmark.java
index 206ad7ed40c..77c166e8623 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractWriteTransactionBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/AbstractWriteTransactionBenchmark.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BenchmarksTableFactory;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public abstract class AbstractWriteTransactionBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsPutUnlessExistsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsPutUnlessExistsBenchmark.java
index 6ebf58fe777..65b46923198 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsPutUnlessExistsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsPutUnlessExistsBenchmark.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.timelock.benchmarks.schema.BenchmarksSchema;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
+import java.util.Map;
 
 public final class KvsPutUnlessExistsBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsReadBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsReadBenchmark.java
index 8e52d2ea710..76e644ef505 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsReadBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsReadBenchmark.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -25,6 +23,7 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
 import com.palantir.logsafe.Preconditions;
+import java.util.Map;
 
 public final class KvsReadBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsWriteBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsWriteBenchmark.java
index 2ce3d341499..65cb725f2b1 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsWriteBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/KvsWriteBenchmark.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-import java.util.UUID;
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.Map;
+import java.util.UUID;
 
 public final class KvsWriteBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockContendedBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockContendedBenchmark.java
index b8105083c65..4358e99c6d9 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockContendedBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockContendedBenchmark.java
@@ -15,11 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -31,6 +26,10 @@
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
 
 public class LockAndUnlockContendedBenchmark extends AbstractBenchmark {
     private static final int ACQUIRE_TIMEOUT_MS = 50_000;
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockUncontendedBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockUncontendedBenchmark.java
index 32f3f9ee71b..4ac993ea090 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockUncontendedBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/LockAndUnlockUncontendedBenchmark.java
@@ -15,10 +15,9 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.lock.v2.TimelockService;
+import java.util.Map;
 
 public final class LockAndUnlockUncontendedBenchmark extends LockAndUnlockContendedBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanDynamicColumnsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanDynamicColumnsBenchmark.java
index deec274c9cd..cfbe96c6119 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanDynamicColumnsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanDynamicColumnsBenchmark.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
@@ -28,6 +25,8 @@
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable.KvDynamicColumnsRow;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.List;
+import java.util.Map;
 
 public final class RangeScanDynamicColumnsBenchmark extends AbstractRangeScanBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanRowsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanRowsBenchmark.java
index 7ef94485d5f..d7fe7697d73 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanRowsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/RangeScanRowsBenchmark.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BenchmarksTableFactory;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvRowsTable;
@@ -25,6 +22,8 @@
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvRowsTable.KvRowsRowResult;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.List;
+import java.util.Map;
 
 public final class RangeScanRowsBenchmark extends AbstractRangeScanBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TimestampBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TimestampBenchmark.java
index 54878acedbd..43e43d42fe2 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TimestampBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TimestampBenchmark.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Map;
-
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.timestamp.TimestampService;
+import java.util.Map;
 
 public final class TimestampBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionReadRowsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionReadRowsBenchmark.java
index d7553a6ce02..f99764fc4ca 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionReadRowsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionReadRowsBenchmark.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BenchmarksTableFactory;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsTable;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsTable.BlobsRow;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
 import com.palantir.logsafe.Preconditions;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class TransactionReadRowsBenchmark extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteBenchmarkContended.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteBenchmarkContended.java
index 2c12859b307..9f86ef24e14 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteBenchmarkContended.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteBenchmarkContended.java
@@ -15,20 +15,18 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.LongStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BenchmarksTableFactory;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsSerializableTable;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsSerializableTable.BlobsSerializableRow;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class TransactionWriteBenchmarkContended extends AbstractBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteDynamicColumnsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteDynamicColumnsBenchmark.java
index c6a0d69b639..399eeca835b 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteDynamicColumnsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteDynamicColumnsBenchmark.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable.KvDynamicColumnsColumn;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable.KvDynamicColumnsColumnValue;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.KvDynamicColumnsTable.KvDynamicColumnsRow;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 public final class TransactionWriteDynamicColumnsBenchmark extends AbstractWriteTransactionBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteRowsBenchmark.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteRowsBenchmark.java
index 2525782f443..679779c69f9 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteRowsBenchmark.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/benchmarks/TransactionWriteRowsBenchmark.java
@@ -15,14 +15,13 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.benchmarks;
 
-import java.util.List;
-import java.util.Map;
-
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsTable;
 import com.palantir.atlasdb.timelock.benchmarks.schema.generated.BlobsTable.BlobsRow;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.random.RandomBytes;
+import java.util.List;
+import java.util.Map;
 
 public final class TransactionWriteRowsBenchmark extends AbstractWriteTransactionBenchmark {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/config/TimelockBenchmarkClientConfig.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/config/TimelockBenchmarkClientConfig.java
index 9290ce954d3..856dd382f7b 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/config/TimelockBenchmarkClientConfig.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/config/TimelockBenchmarkClientConfig.java
@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.atlasdb.config.AtlasDbConfig;
-
 import io.dropwizard.Configuration;
 
 public class TimelockBenchmarkClientConfig extends Configuration {
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarkRunnerBase.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarkRunnerBase.java
index 4ed3cd35d22..2acc632e312 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarkRunnerBase.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarkRunnerBase.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.runner;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Map;
-import java.util.function.BiFunction;
-import java.util.function.Supplier;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -34,6 +25,13 @@
 import com.palantir.atlasdb.timelock.benchmarks.BenchmarksService;
 import com.palantir.conjure.java.api.config.service.UserAgent;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+import org.apache.commons.lang3.StringUtils;
 
 public class BenchmarkRunnerBase {
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarksRunner.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarksRunner.java
index f58906b7109..29a54d012e9 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarksRunner.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/BenchmarksRunner.java
@@ -84,4 +84,3 @@ public void dynamicColumnsRangeScan() {
     }
 
 }
-
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/SlaVerifier.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/SlaVerifier.java
index 95f468b42ef..9c1170ac218 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/SlaVerifier.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/runner/SlaVerifier.java
@@ -25,7 +25,6 @@
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/BenchmarksSchema.java b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/BenchmarksSchema.java
index e8ad5bd88e1..d417505e386 100644
--- a/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/BenchmarksSchema.java
+++ b/timelock-server-benchmark-client/src/main/java/com/palantir/atlasdb/timelock/benchmarks/schema/BenchmarksSchema.java
@@ -15,9 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.benchmarks.schema;
 
-import java.io.File;
-import java.io.IOException;
-
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.schema.AtlasSchema;
@@ -26,6 +23,8 @@
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
+import java.io.File;
+import java.io.IOException;
 
 public final class BenchmarksSchema implements AtlasSchema {
     public static final Namespace NAMESPACE = Namespace.create("benchmarks");
diff --git a/timelock-server-benchmark-cluster/src/main/java/com/palantir/atlasdb/timelock/benchmarks/server/TimelockBenchmarkServerLauncher.java b/timelock-server-benchmark-cluster/src/main/java/com/palantir/atlasdb/timelock/benchmarks/server/TimelockBenchmarkServerLauncher.java
index 0a016dddc5f..105137b11e6 100644
--- a/timelock-server-benchmark-cluster/src/main/java/com/palantir/atlasdb/timelock/benchmarks/server/TimelockBenchmarkServerLauncher.java
+++ b/timelock-server-benchmark-cluster/src/main/java/com/palantir/atlasdb/timelock/benchmarks/server/TimelockBenchmarkServerLauncher.java
@@ -23,7 +23,6 @@
 import com.palantir.conjure.java.api.config.service.UserAgent;
 import com.palantir.timelock.paxos.TimeLockAgent;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
-
 import io.dropwizard.Application;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AbstractAsyncTimelockServiceIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AbstractAsyncTimelockServiceIntegrationTest.java
index 2d1ac8054ca..8d2f6b156bc 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AbstractAsyncTimelockServiceIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AbstractAsyncTimelockServiceIntegrationTest.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.atlasdb.timelock;
 
+import com.palantir.atlasdb.timelock.ImmutableTemplateVariables.TimestampPaxos;
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 
-import com.palantir.atlasdb.timelock.ImmutableTemplateVariables.TimestampPaxos;
-
 public abstract class AbstractAsyncTimelockServiceIntegrationTest {
 
     public static final TemplateVariables DEFAULT_SINGLE_SERVER = ImmutableTemplateVariables.builder()
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceIntegrationTest.java
index 17d83f2b022..d722c133567 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceIntegrationTest.java
@@ -18,24 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.assertj.core.api.Condition;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.codahale.metrics.Metric;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -68,6 +50,22 @@
 import com.palantir.lock.v2.WaitForLocksResponse;
 import com.palantir.timestamp.TimestampRange;
 import com.palantir.tritium.metrics.registry.MetricName;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.assertj.core.api.Condition;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class AsyncTimelockServiceIntegrationTest extends AbstractAsyncTimelockServiceIntegrationTest {
 
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTargetedSweepRateLimitingTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTargetedSweepRateLimitingTest.java
index cb94df72630..6b5a7ce6081 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTargetedSweepRateLimitingTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTargetedSweepRateLimitingTest.java
@@ -16,29 +16,10 @@
 
 package com.palantir.atlasdb.timelock;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.CONSERVATIVE;
 import static com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy.THOROUGH;
 import static com.palantir.atlasdb.timelock.lock.TargetedSweepLockDecorator.LOCK_ACQUIRES_PER_SECOND;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.assertj.core.data.Offset;
-import org.junit.After;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.codahale.metrics.Meter;
 import com.google.common.collect.ImmutableList;
@@ -62,6 +43,22 @@
 import com.palantir.lock.v2.LockResponse;
 import com.palantir.lock.v2.LockToken;
 import com.palantir.util.Pair;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.assertj.core.data.Offset;
+import org.junit.After;
+import org.junit.Test;
 
 public class AsyncTimelockServiceTargetedSweepRateLimitingTest extends AbstractAsyncTimelockServiceIntegrationTest {
 
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTransactionIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTransactionIntegrationTest.java
index a03492cabab..8bdd774bbbd 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTransactionIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/AsyncTimelockServiceTransactionIntegrationTest.java
@@ -19,20 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertTrue;
 
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.assertj.core.api.ThrowableAssert;
-import org.junit.Test;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -48,6 +34,18 @@
 import com.palantir.lock.LockRefreshToken;
 import com.palantir.lock.LockRequest;
 import com.palantir.lock.StringLockDescriptor;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.assertj.core.api.ThrowableAssert;
+import org.junit.Test;
 
 public class AsyncTimelockServiceTransactionIntegrationTest extends AbstractAsyncTimelockServiceIntegrationTest {
 
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/IsolatedPaxosTimeLockServerIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/IsolatedPaxosTimeLockServerIntegrationTest.java
index 2cf84d29ee1..7a42e693605 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/IsolatedPaxosTimeLockServerIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/IsolatedPaxosTimeLockServerIntegrationTest.java
@@ -18,13 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.Optional;
-
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-
 import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.http.AtlasDbHttpClients;
 import com.palantir.atlasdb.http.TestProxyUtils;
@@ -35,6 +28,11 @@
 import com.palantir.atlasdb.util.MetricsManagers;
 import com.palantir.paxos.PaxosAcceptor;
 import com.palantir.paxos.PaxosLearner;
+import java.util.Optional;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
 
 /**
  * This test creates a single TimeLock server that is configured in a three node configuration.
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/PaxosTimeLockServerIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/PaxosTimeLockServerIntegrationTest.java
index 7f2d9738da5..651cfaeca7a 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/PaxosTimeLockServerIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/PaxosTimeLockServerIntegrationTest.java
@@ -15,23 +15,10 @@
  */
 package com.palantir.atlasdb.timelock;
 
+import static com.palantir.atlasdb.timelock.AbstractAsyncTimelockServiceIntegrationTest.DEFAULT_SINGLE_SERVER;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import static com.palantir.atlasdb.timelock.AbstractAsyncTimelockServiceIntegrationTest.DEFAULT_SINGLE_SERVER;
-
-import java.util.List;
-import java.util.SortedMap;
-import java.util.concurrent.TimeUnit;
-
-import org.awaitility.Awaitility;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
@@ -44,6 +31,16 @@
 import com.palantir.lock.v2.LockToken;
 import com.palantir.lock.v2.TimelockService;
 import com.palantir.timestamp.TimestampManagementService;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.concurrent.TimeUnit;
+import org.awaitility.Awaitility;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TemporaryFolder;
+import org.slf4j.LoggerFactory;
 
 public class PaxosTimeLockServerIntegrationTest {
     private static final String CLIENT_1 = "test";
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TimeLockServerDownIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TimeLockServerDownIntegrationTest.java
index b2180ab849b..066f0006a9e 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TimeLockServerDownIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TimeLockServerDownIntegrationTest.java
@@ -15,15 +15,10 @@
  */
 package com.palantir.atlasdb.timelock;
 
+import static com.palantir.atlasdb.timelock.AbstractAsyncTimelockServiceIntegrationTest.DEFAULT_SINGLE_SERVER;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import static com.palantir.atlasdb.timelock.AbstractAsyncTimelockServiceIntegrationTest.DEFAULT_SINGLE_SERVER;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -32,6 +27,9 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.exception.AtlasDbDependencyException;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
 
 public class TimeLockServerDownIntegrationTest {
     private static final TableReference TABLE = TableReference.create(Namespace.create("test"), "test");
diff --git a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TransactionPostMortemIntegrationTest.java b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TransactionPostMortemIntegrationTest.java
index 579c84f5855..e77114050b9 100644
--- a/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TransactionPostMortemIntegrationTest.java
+++ b/timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/TransactionPostMortemIntegrationTest.java
@@ -16,14 +16,6 @@
 
 package com.palantir.atlasdb.timelock;
 
-import java.time.Duration;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Consumer;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.config.AtlasDbRuntimeConfig;
@@ -43,6 +35,12 @@
 import com.palantir.example.profile.schema.generated.UserProfileTable;
 import com.palantir.example.profile.schema.generated.UserProfileTable.PhotoStreamId;
 import com.palantir.example.profile.schema.generated.UserProfileTable.UserProfileRow;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.function.Consumer;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * TODO(fdesouza): Remove this once PDS-95791 is resolved.
diff --git a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/TimeLockServerLauncher.java b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/TimeLockServerLauncher.java
index 11c724d602f..475fc2f7923 100644
--- a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/TimeLockServerLauncher.java
+++ b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/TimeLockServerLauncher.java
@@ -15,13 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.util.UUID;
-import java.util.function.Consumer;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.SharedMetricRegistries;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -35,12 +28,16 @@
 import com.palantir.timelock.paxos.TimeLockAgent;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
-
 import io.dropwizard.Application;
 import io.dropwizard.jersey.optional.EmptyOptionalException;
 import io.dropwizard.lifecycle.Managed;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
+import java.util.UUID;
+import java.util.function.Consumer;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
 
 /**
  * Provides a way of launching an embedded TimeLock server using Dropwizard. Should only be used in tests.
diff --git a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/CombinedTimeLockServerConfiguration.java b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/CombinedTimeLockServerConfiguration.java
index 496c30302ba..08361a1ec03 100644
--- a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/CombinedTimeLockServerConfiguration.java
+++ b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/config/CombinedTimeLockServerConfiguration.java
@@ -19,7 +19,6 @@
 import com.palantir.conjure.java.api.config.service.HumanReadableDuration;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
 import com.palantir.timelock.config.TimeLockRuntimeConfiguration;
-
 import io.dropwizard.Configuration;
 
 public class CombinedTimeLockServerConfiguration extends Configuration {
diff --git a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/logging/NonBlockingFileAppenderFactory.java b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/logging/NonBlockingFileAppenderFactory.java
index 38be7ba787d..388f5f26632 100644
--- a/timelock-server/src/main/java/com/palantir/atlasdb/timelock/logging/NonBlockingFileAppenderFactory.java
+++ b/timelock-server/src/main/java/com/palantir/atlasdb/timelock/logging/NonBlockingFileAppenderFactory.java
@@ -15,15 +15,12 @@
  */
 package com.palantir.atlasdb.timelock.logging;
 
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.google.common.base.Preconditions;
-
-// CHECKSTYLE:OFF
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.AsyncAppenderBase;
 import ch.qos.logback.core.spi.DeferredProcessingAware;
-// CHECKSTYLE:ON
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.google.common.base.Preconditions;
 import io.dropwizard.logging.FileAppenderFactory;
 import io.dropwizard.logging.async.AsyncAppenderFactory;
 import io.dropwizard.logging.filter.LevelFilterFactory;
diff --git a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/MultiNodePaxosTimeLockServerIntegrationTest.java b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/MultiNodePaxosTimeLockServerIntegrationTest.java
index 5f009ffc404..2c6eb7cbeb5 100644
--- a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/MultiNodePaxosTimeLockServerIntegrationTest.java
+++ b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/MultiNodePaxosTimeLockServerIntegrationTest.java
@@ -19,15 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.timelock.suite.PaxosSuite;
@@ -38,6 +29,13 @@
 import com.palantir.lock.v2.LeaderTime;
 import com.palantir.lock.v2.LockRequest;
 import com.palantir.lock.v2.LockToken;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class MultiNodePaxosTimeLockServerIntegrationTest {
diff --git a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/SingleLeaderMultiNodePaxosTimeLockIntegrationTest.java b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/SingleLeaderMultiNodePaxosTimeLockIntegrationTest.java
index ede41bb5b6d..93d0f18cc87 100644
--- a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/SingleLeaderMultiNodePaxosTimeLockIntegrationTest.java
+++ b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/SingleLeaderMultiNodePaxosTimeLockIntegrationTest.java
@@ -20,16 +20,15 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.palantir.atlasdb.timelock.suite.PaxosSuite;
+import com.palantir.atlasdb.timelock.util.ExceptionMatchers;
+import com.palantir.atlasdb.timelock.util.ParameterInjector;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.palantir.atlasdb.timelock.suite.PaxosSuite;
-import com.palantir.atlasdb.timelock.util.ExceptionMatchers;
-import com.palantir.atlasdb.timelock.util.ParameterInjector;
-
 @RunWith(Parameterized.class)
 public class SingleLeaderMultiNodePaxosTimeLockIntegrationTest {
 
diff --git a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/suite/PaxosSuite.java b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/suite/PaxosSuite.java
index 4a2328d2c64..daffba1c7f0 100644
--- a/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/suite/PaxosSuite.java
+++ b/timelock-server/src/suiteTest/java/com/palantir/atlasdb/timelock/suite/PaxosSuite.java
@@ -16,24 +16,22 @@
 
 package com.palantir.atlasdb.timelock.suite;
 
+import com.github.peterwippermann.junit4.parameterizedsuite.ParameterizedSuite;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.timelock.ImmutableTemplateVariables;
+import com.palantir.atlasdb.timelock.MultiNodePaxosTimeLockServerIntegrationTest;
+import com.palantir.atlasdb.timelock.TemplateVariables;
+import com.palantir.atlasdb.timelock.TestableTimelockCluster;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Suite;
 
-import com.github.peterwippermann.junit4.parameterizedsuite.ParameterizedSuite;
-import com.google.common.collect.ImmutableSet;
-import com.palantir.atlasdb.timelock.ImmutableTemplateVariables;
-import com.palantir.atlasdb.timelock.MultiNodePaxosTimeLockServerIntegrationTest;
-import com.palantir.atlasdb.timelock.TemplateVariables;
-import com.palantir.atlasdb.timelock.TestableTimelockCluster;
-
 @RunWith(ParameterizedSuite.class)
 @Suite.SuiteClasses(MultiNodePaxosTimeLockServerIntegrationTest.class)
 public class PaxosSuite {
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/DatabaseTsBoundPersisterConfigurationTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/DatabaseTsBoundPersisterConfigurationTest.java
index ecc55acb7f7..d76d092f8f8 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/DatabaseTsBoundPersisterConfigurationTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/config/DatabaseTsBoundPersisterConfigurationTest.java
@@ -17,11 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import com.palantir.atlasdb.memory.InMemoryAtlasDbConfig;
 import com.palantir.timelock.config.DatabaseTsBoundPersisterConfiguration;
 import com.palantir.timelock.config.ImmutableDatabaseTsBoundPersisterConfiguration;
+import org.junit.Test;
 
 public class DatabaseTsBoundPersisterConfigurationTest {
     @Test
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceEteTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceEteTest.java
index 9c0aa0cc6c3..e8ececb5c7c 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceEteTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceEteTest.java
@@ -20,19 +20,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.Uninterruptibles;
@@ -45,6 +32,17 @@
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.lock.v2.LockToken;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
 
 public class AsyncLockServiceEteTest {
 
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
index 74562d2e374..fd77f5239c5 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/AsyncLockServiceTest.java
@@ -26,22 +26,20 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.timelock.lock.watch.LockWatchingService;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.lock.StringLockDescriptor;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.timelock.lock.watch.LockWatchingService;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.lock.StringLockDescriptor;
-
 public class AsyncLockServiceTest {
 
     private static final UUID REQUEST_ID = UUID.randomUUID();
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ExclusiveLockTests.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ExclusiveLockTests.java
index fa6bbe0d7c0..a623f04587f 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ExclusiveLockTests.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ExclusiveLockTests.java
@@ -19,12 +19,10 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertTrue;
 
-import java.util.UUID;
-
-import org.junit.Test;
-
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
+import java.util.UUID;
+import org.junit.Test;
 
 public class ExclusiveLockTests {
 
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollectionTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollectionTest.java
index b8db85d9a88..5cb8fb8f567 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollectionTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksCollectionTest.java
@@ -21,15 +21,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSet;
@@ -40,6 +31,13 @@
 import com.palantir.lock.v2.LeadershipId;
 import com.palantir.lock.v2.Lease;
 import com.palantir.lock.v2.LockToken;
+import java.time.Duration;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import org.junit.Test;
 
 public class HeldLocksCollectionTest {
 
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksTest.java
index 56392819a86..35a25f6e8d9 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/HeldLocksTest.java
@@ -22,16 +22,14 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.UUID;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.timelock.lock.watch.LockWatchingService;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.StringLockDescriptor;
+import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
 
 public class HeldLocksTest {
 
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTrackerTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTrackerTest.java
index 0d5c1ffd25b..130f6d9f44a 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTrackerTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/ImmutableTimestampTrackerTest.java
@@ -20,7 +20,6 @@
 
 import java.util.Optional;
 import java.util.UUID;
-
 import org.junit.Test;
 
 public class ImmutableTimestampTrackerTest {
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimerTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimerTest.java
index 481b4bb385d..4e3492fb56e 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimerTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LeaseExpirationTimerTest.java
@@ -17,14 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.palantir.common.time.NanoTime;
 import java.time.Duration;
 import java.util.function.Supplier;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import com.palantir.common.time.NanoTime;
-
 public class LeaseExpirationTimerTest {
 
     private static final long START_TIME_NANOS = 123L;
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockAcquirerTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockAcquirerTest.java
index 2e12e6347ed..2d795754711 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockAcquirerTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockAcquirerTest.java
@@ -27,22 +27,20 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import com.codahale.metrics.MetricRegistry;
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.timelock.lock.watch.LockWatchingService;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.lock.StringLockDescriptor;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import com.codahale.metrics.MetricRegistry;
-import com.google.common.collect.ImmutableList;
-import com.palantir.atlasdb.timelock.lock.watch.LockWatchingService;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.lock.StringLockDescriptor;
-
 public class LockAcquirerTest {
 
     private static final UUID REQUEST_ID = UUID.randomUUID();
diff --git a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockCollectionTest.java b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockCollectionTest.java
index a8dfd080a29..124793a3cf7 100644
--- a/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockCollectionTest.java
+++ b/timelock-server/src/test/java/com/palantir/atlasdb/timelock/lock/LockCollectionTest.java
@@ -17,19 +17,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableSet;
+import com.palantir.lock.LockDescriptor;
+import com.palantir.lock.StringLockDescriptor;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-import com.palantir.lock.LockDescriptor;
-import com.palantir.lock.StringLockDescriptor;
-
 public class LockCollectionTest {
 
     private final LockCollection lockCollection = new LockCollection(OrderedLocksDecorator.DO_NOTHING);
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/Http2Agent.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/Http2Agent.java
index 4a4242376b4..44a7a7cb967 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/Http2Agent.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/Http2Agent.java
@@ -16,14 +16,12 @@
 
 package com.palantir.atlasdb.timelock;
 
+import com.ea.agentloader.AgentLoader;
 import java.lang.instrument.Instrumentation;
-
 import org.mortbay.jetty.alpn.agent.Premain;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.ea.agentloader.AgentLoader;
-
 /** A very simple wrapper around the jetty-alpn-agent for dynamic loading. */
 public final class Http2Agent {
     private Http2Agent() {}
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/NamespacedClients.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/NamespacedClients.java
index f6ca18a6184..129f41faf91 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/NamespacedClients.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/NamespacedClients.java
@@ -16,8 +16,6 @@
 
 package com.palantir.atlasdb.timelock;
 
-import org.immutables.value.Value;
-
 import com.google.common.collect.ImmutableSet;
 import com.palantir.lock.LockRpcClient;
 import com.palantir.lock.LockService;
@@ -35,6 +33,7 @@
 import com.palantir.timestamp.TimestampManagementRpcClient;
 import com.palantir.timestamp.TimestampManagementService;
 import com.palantir.timestamp.TimestampRange;
+import org.immutables.value.Value;
 
 @Value.Immutable
 public interface NamespacedClients {
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemplateVariables.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemplateVariables.java
index cb7488e9c33..0277376f69a 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemplateVariables.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemplateVariables.java
@@ -17,9 +17,7 @@
 package com.palantir.atlasdb.timelock;
 
 import java.util.List;
-
 import javax.annotation.Nullable;
-
 import org.immutables.value.Value;
 
 @Value.Immutable
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolder.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolder.java
index 544cb98e3a0..b594a2b733f 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolder.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TemporaryConfigurationHolder.java
@@ -15,17 +15,15 @@
  */
 package com.palantir.atlasdb.timelock;
 
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateExceptionHandler;
 import java.io.File;
 import java.io.FileWriter;
 import java.util.Locale;
-
 import org.junit.rules.ExternalResource;
 import org.junit.rules.TemporaryFolder;
 
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateExceptionHandler;
-
 public class TemporaryConfigurationHolder extends ExternalResource {
 
     private static final Configuration TEMPLATE_CONFIG = templateConfig();
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableLeaderPinger.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableLeaderPinger.java
index 1c3495dc6f4..ce9ee464a0c 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableLeaderPinger.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableLeaderPinger.java
@@ -16,9 +16,8 @@
 
 package com.palantir.atlasdb.timelock;
 
-import java.util.Set;
-
 import com.google.common.collect.ImmutableSet;
+import java.util.Set;
 
 public interface TestableLeaderPinger {
     default Set<String> ping(String... namespaces) {
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockCluster.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockCluster.java
index 0aecce9d673..cde1f44b0ac 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockCluster.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockCluster.java
@@ -17,6 +17,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.SetMultimap;
+import com.google.common.collect.Sets;
+import com.google.common.collect.Streams;
+import com.google.common.hash.Hashing;
+import com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.PaxosContainer;
+import com.palantir.atlasdb.timelock.util.TestProxies;
+import com.palantir.common.streams.KeyedStream;
+import com.palantir.paxos.InProgressResponseState;
+import com.palantir.paxos.PaxosQuorumChecker;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
@@ -29,7 +43,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.awaitility.Awaitility;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TemporaryFolder;
@@ -37,21 +50,6 @@
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.SetMultimap;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Streams;
-import com.google.common.hash.Hashing;
-import com.palantir.atlasdb.timelock.paxos.PaxosQuorumCheckingCoalescingFunction.PaxosContainer;
-import com.palantir.atlasdb.timelock.util.TestProxies;
-import com.palantir.common.streams.KeyedStream;
-import com.palantir.paxos.InProgressResponseState;
-import com.palantir.paxos.PaxosQuorumChecker;
-
 public class TestableTimelockCluster implements TestRule {
 
     private final TemporaryFolder temporaryFolder = new TemporaryFolder();
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java
index 740fded1dcf..e2a033d9a25 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java
@@ -15,8 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.util.Map;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
@@ -24,6 +22,7 @@
 import com.palantir.atlasdb.timelock.util.TestProxies;
 import com.palantir.leader.PingableLeader;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.util.Map;
 
 public class TestableTimelockServer {
 
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockServerHolder.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockServerHolder.java
index 0ee6e5efacd..b8f6dae7c02 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockServerHolder.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockServerHolder.java
@@ -15,19 +15,16 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.function.Supplier;
-
-import org.junit.rules.ExternalResource;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.palantir.atlasdb.timelock.config.CombinedTimeLockServerConfiguration;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
-
 import io.dropwizard.testing.DropwizardTestSupport;
+import java.io.File;
+import java.io.IOException;
+import java.util.function.Supplier;
+import org.junit.rules.ExternalResource;
 
 public class TimeLockServerHolder extends ExternalResource {
 
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockTestUtils.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockTestUtils.java
index ce27846866f..666659557cb 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockTestUtils.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TimeLockTestUtils.java
@@ -15,15 +15,6 @@
  */
 package com.palantir.atlasdb.timelock;
 
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.immutables.value.Value;
-
 import com.codahale.metrics.MetricRegistry;
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.AtlasDbRuntimeConfig;
@@ -40,6 +31,13 @@
 import com.palantir.conjure.java.api.config.service.UserAgent;
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.immutables.value.Value;
 
 public final class TimeLockTestUtils {
     private TimeLockTestUtils() {
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ExceptionMatchers.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ExceptionMatchers.java
index 062807a8098..ef62ca41202 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ExceptionMatchers.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ExceptionMatchers.java
@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.palantir.conjure.java.api.errors.QosException;
-
 import feign.RetryableException;
 
 public final class ExceptionMatchers {
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ParameterInjector.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ParameterInjector.java
index 8f516762eae..28f6ed954a4 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ParameterInjector.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ParameterInjector.java
@@ -16,15 +16,13 @@
 
 package com.palantir.atlasdb.timelock.util;
 
+import com.github.peterwippermann.junit4.parameterizedsuite.ParameterContext;
+import com.google.common.collect.ImmutableSet;
 import java.util.function.Supplier;
-
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import com.github.peterwippermann.junit4.parameterizedsuite.ParameterContext;
-import com.google.common.collect.ImmutableSet;
-
 public final class ParameterInjector<T extends TestRule> implements TestRule {
 
     private final Supplier<T> factory;
diff --git a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java
index 5e4f90ea561..389dd81de99 100644
--- a/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java
+++ b/timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java
@@ -15,12 +15,6 @@
  */
 package com.palantir.atlasdb.timelock.util;
 
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Collectors;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.config.ImmutableServerListConfig;
@@ -32,6 +26,11 @@
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
 import com.palantir.conjure.java.config.ssl.TrustContext;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
 
 public class TestProxies {
 
diff --git a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementRpcClient.java b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementRpcClient.java
index 508bf2b0c32..641af047b39 100644
--- a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementRpcClient.java
+++ b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementRpcClient.java
@@ -16,6 +16,7 @@
 
 package com.palantir.timestamp;
 
+import com.palantir.logsafe.Safe;
 import javax.annotation.CheckReturnValue;
 import javax.annotation.meta.When;
 import javax.ws.rs.GET;
@@ -26,8 +27,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.logsafe.Safe;
-
 @Path("{namespace}/timestamp-management")
 public interface TimestampManagementRpcClient {
     @POST
diff --git a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java
index fbe0aab8160..a1d9ade8d5b 100644
--- a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java
+++ b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.timestamp;
 
+import com.palantir.logsafe.Safe;
 import javax.annotation.CheckReturnValue;
 import javax.annotation.meta.When;
 import javax.ws.rs.DefaultValue;
@@ -25,8 +26,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.logsafe.Safe;
-
 @Path("/timestamp-management")
 public interface TimestampManagementService {
     long SENTINEL_TIMESTAMP = Long.MIN_VALUE;
diff --git a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java
index 5a8ea210c4d..d90f230caa0 100644
--- a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java
+++ b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java
@@ -15,11 +15,10 @@
  */
 package com.palantir.timestamp;
 
-import java.io.Serializable;
-import java.util.Objects;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * A TimestampRange represents an inclusive range of longs.
diff --git a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampService.java b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampService.java
index 0464535acae..afc145a4fda 100644
--- a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampService.java
+++ b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampService.java
@@ -15,16 +15,15 @@
  */
 package com.palantir.timestamp;
 
+import com.palantir.logsafe.Safe;
+import com.palantir.processors.AutoDelegate;
+import com.palantir.processors.DoDelegate;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import com.palantir.logsafe.Safe;
-import com.palantir.processors.AutoDelegate;
-import com.palantir.processors.DoDelegate;
-
 /**
  * A {@link TimestampService} serves a sequence of timestamps. Requests to {@link TimestampService#getFreshTimestamp()}
  * and {@link TimestampService#getFreshTimestamps(int)} should return results that are unique and increasing, in that
diff --git a/timestamp-client/src/main/java/com/palantir/timestamp/DelegatingManagedTimestampService.java b/timestamp-client/src/main/java/com/palantir/timestamp/DelegatingManagedTimestampService.java
index 83e3af96358..443bd8329eb 100644
--- a/timestamp-client/src/main/java/com/palantir/timestamp/DelegatingManagedTimestampService.java
+++ b/timestamp-client/src/main/java/com/palantir/timestamp/DelegatingManagedTimestampService.java
@@ -15,9 +15,8 @@
  */
 package com.palantir.timestamp;
 
-import javax.ws.rs.QueryParam;
-
 import com.palantir.logsafe.Preconditions;
+import javax.ws.rs.QueryParam;
 
 public class DelegatingManagedTimestampService implements ManagedTimestampService {
     private final TimestampService timestampService;
diff --git a/timestamp-client/src/main/java/com/palantir/timestamp/RequestBatchingTimestampService.java b/timestamp-client/src/main/java/com/palantir/timestamp/RequestBatchingTimestampService.java
index 57090c3d5d6..5b87ec30126 100644
--- a/timestamp-client/src/main/java/com/palantir/timestamp/RequestBatchingTimestampService.java
+++ b/timestamp-client/src/main/java/com/palantir/timestamp/RequestBatchingTimestampService.java
@@ -16,12 +16,6 @@
 
 package com.palantir.timestamp;
 
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-
-import javax.annotation.concurrent.ThreadSafe;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -33,6 +27,10 @@
 import com.palantir.logsafe.Preconditions;
 import com.palantir.util.jmx.OperationTimer;
 import com.palantir.util.timer.LoggingOperationTimer;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+import javax.annotation.concurrent.ThreadSafe;
 
 /**
  * This uses smart batching to queue up requests and send them all as one larger batch.
diff --git a/timestamp-client/src/test/java/com/palantir/timestamp/RequestBatchingTimestampServiceTest.java b/timestamp-client/src/test/java/com/palantir/timestamp/RequestBatchingTimestampServiceTest.java
index f77bf8c3f2c..a9adeabbefe 100644
--- a/timestamp-client/src/test/java/com/palantir/timestamp/RequestBatchingTimestampServiceTest.java
+++ b/timestamp-client/src/test/java/com/palantir/timestamp/RequestBatchingTimestampServiceTest.java
@@ -17,7 +17,6 @@
 package com.palantir.timestamp;
 
 import static java.util.stream.Collectors.toList;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertFalse;
@@ -27,10 +26,13 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.SettableFuture;
+import com.palantir.atlasdb.autobatch.BatchElement;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.immutables.value.Value;
 import org.junit.After;
 import org.junit.Before;
@@ -39,11 +41,6 @@
 import org.mockito.Spy;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.SettableFuture;
-import com.palantir.atlasdb.autobatch.BatchElement;
-
 @RunWith(MockitoJUnitRunner.class)
 public final class RequestBatchingTimestampServiceTest {
     private static final int MAX_TIMESTAMPS = 10_000;
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/DebugLogger.java b/timestamp-impl/src/main/java/com/palantir/timestamp/DebugLogger.java
index bac9b5373f3..35b81da4fcf 100644
--- a/timestamp-impl/src/main/java/com/palantir/timestamp/DebugLogger.java
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/DebugLogger.java
@@ -15,13 +15,11 @@
  */
 package com.palantir.timestamp;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is a logger intended for use tracking down problems arising from
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampServiceImpl.java b/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampServiceImpl.java
index 6400e8d54d1..ccef62b8283 100644
--- a/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampServiceImpl.java
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampServiceImpl.java
@@ -15,16 +15,14 @@
  */
 package com.palantir.timestamp;
 
-import javax.annotation.concurrent.ThreadSafe;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.palantir.async.initializer.AsyncInitializer;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.logsafe.SafeArg;
+import javax.annotation.concurrent.ThreadSafe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @ThreadSafe
 public class PersistentTimestampServiceImpl implements PersistentTimestampService {
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java b/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java
index 1c469b53413..4dc21bbd634 100644
--- a/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java
@@ -15,14 +15,12 @@
  */
 package com.palantir.timestamp;
 
-import javax.annotation.concurrent.ThreadSafe;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.common.remoting.ServiceNotAvailableException;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import javax.annotation.concurrent.ThreadSafe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @ThreadSafe
 public class TimestampAllocationFailures {
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/AtomicTimestampTests.java b/timestamp-impl/src/test/java/com/palantir/timestamp/AtomicTimestampTests.java
index 5c47695a379..9cdd7b3fc8b 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/AtomicTimestampTests.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/AtomicTimestampTests.java
@@ -22,7 +22,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/ErrorCheckingTimestampBoundStoreTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/ErrorCheckingTimestampBoundStoreTest.java
index d659943a3e1..5245e0f45fb 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/ErrorCheckingTimestampBoundStoreTest.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/ErrorCheckingTimestampBoundStoreTest.java
@@ -23,12 +23,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.palantir.exception.PalantirInterruptedException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.palantir.exception.PalantirInterruptedException;
-
 public class ErrorCheckingTimestampBoundStoreTest {
 
     @Rule
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceMockingTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceMockingTest.java
index 7ef71724bc0..2ce0cb1557f 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceMockingTest.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceMockingTest.java
@@ -77,4 +77,3 @@ public void shouldRejectFastForwardToTheSentinelValue() {
         timestampService.fastForwardTimestamp(TimestampManagementService.SENTINEL_TIMESTAMP);
     }
 }
-
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTests.java b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTests.java
index d438d44e844..a4e490b09b8 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTests.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTests.java
@@ -19,13 +19,12 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.lessThan;
 
+import com.palantir.atlasdb.timestamp.AbstractTimestampServiceTests;
+import com.palantir.common.remoting.ServiceNotAvailableException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.palantir.atlasdb.timestamp.AbstractTimestampServiceTests;
-import com.palantir.common.remoting.ServiceNotAvailableException;
-
 // Test PersistentTimestampServiceImpl by fully instantiating it with an InMemoryTimestampBoundStore.
 // See also PersistentTimestampServiceMockingTest that mocks AvailableTimestamps instead.
 public class PersistentTimestampServiceTests extends AbstractTimestampServiceTests {
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampTests.java b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampTests.java
index ed205cee1e9..4211366e839 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampTests.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampTests.java
@@ -76,4 +76,3 @@ public void shouldHandOutRangesOfTheCorrectSize() {
     }
 
 }
-
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java
index 7ff646833b0..7e386a38da4 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java
@@ -24,13 +24,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+import com.palantir.common.remoting.ServiceNotAvailableException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.slf4j.Logger;
 
-import com.palantir.common.remoting.ServiceNotAvailableException;
-
 public class TimestampAllocationFailuresTest {
     private static final RuntimeException FAILURE = new IllegalStateException();
     private static final ServiceNotAvailableException SERVICE_NOT_AVAILABLE_EXCEPTION =
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangesTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangesTest.java
index 230fb89b86b..f4d7977b452 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangesTest.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangesTest.java
@@ -20,7 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.stream.LongStream;
-
 import org.junit.Test;
 
 public class TimestampRangesTest {