diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
index 7d0d4ba97b..1d6aa830a4 100644
--- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
+++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
@@ -274,14 +274,14 @@ public void generate() throws IOException
 
             final String decoderClassName = formatClassName(decoderName(msgToken.name()));
             final String decoderStateClassName = decoderClassName + "#CodecStates";
-            final FieldPrecedenceModel decoderPrecedenceModel =
-                precedenceChecks.createDecoderModel(decoderStateClassName, tokens);
+            final FieldPrecedenceModel decoderPrecedenceModel = precedenceChecks.createDecoderModel(
+                decoderStateClassName, tokens);
             generateDecoder(decoderClassName, msgToken, fields, groups, varData, hasVarData, decoderPrecedenceModel);
 
             final String encoderClassName = formatClassName(encoderName(msgToken.name()));
             final String encoderStateClassName = encoderClassName + "#CodecStates";
-            final FieldPrecedenceModel encoderPrecedenceModel =
-                precedenceChecks.createEncoderModel(encoderStateClassName, tokens);
+            final FieldPrecedenceModel encoderPrecedenceModel = precedenceChecks.createEncoderModel(
+                encoderStateClassName, tokens);
             generateEncoder(encoderClassName, msgToken, fields, groups, varData, hasVarData, encoderPrecedenceModel);
         }
     }
@@ -839,7 +839,8 @@ private void generateDecoder(
 
     private void generateDecoderGroups(
         final StringBuilder sb,
-        final FieldPrecedenceModel fieldPrecedenceModel, final String outerClassName,
+        final FieldPrecedenceModel fieldPrecedenceModel,
+        final String outerClassName,
         final List<Token> tokens,
         final String indent,
         final boolean isSubGroup) throws IOException
@@ -993,7 +994,6 @@ private void generateGroupDecoderClassHeader(
             .append(indent).append("        count = ").append(numInGroupCast).append(numInGroupGet).append(";\n")
             .append(indent).append("    }\n\n");
 
-
         generateAccessOrderListenerMethodForNextGroupElement(sb, fieldPrecedenceModel, indent + "    ", groupToken);
 
         sb.append(indent).append("    public ").append(className).append(" next()\n")
@@ -2345,16 +2345,16 @@ private String interfaceImportLine()
     }
 
 
-    private CharSequence generateFileHeader(final String packageName, final Set<String> importedTypesPackages,
+    private CharSequence generateFileHeader(
+        final String packageName,
+        final Set<String> importedTypesPackages,
         final String fqBuffer)
     {
-        final StringBuilder importStatements = generateImportStatements(importedTypesPackages, packageName);
-
         return "/* Generated SBE (Simple Binary Encoding) message codec. */\n" +
             "package " + packageName + ";\n\n" +
             "import " + fqBuffer + ";\n" +
             interfaceImportLine() +
-            importStatements;
+            generateImportStatements(importedTypesPackages, packageName);
     }
 
     private CharSequence generateMainHeader(
@@ -4470,7 +4470,6 @@ private void appendDecoderDisplay(
             append(sb, indent, groupName + ".index = " + groupName + "OriginalIndex;");
             Separator.END_GROUP.appendToGeneratedBuilder(sb, indent);
 
-
             lengthBeforeLastGeneratedSeparator = sb.length();
             Separator.FIELD.appendToGeneratedBuilder(sb, indent);