diff --git a/src/main/java/de/neemann/digital/builder/Gal16v8/Gal16v8CuplExporter.java b/src/main/java/de/neemann/digital/builder/Gal16v8/Gal16v8CuplExporter.java
index 822173d53..f75801c18 100644
--- a/src/main/java/de/neemann/digital/builder/Gal16v8/Gal16v8CuplExporter.java
+++ b/src/main/java/de/neemann/digital/builder/Gal16v8/Gal16v8CuplExporter.java
@@ -76,6 +76,7 @@ public class Gal16v8CuplExporter implements ExpressionExporter<Gal16v8CuplExport
      * Sets the project name
      *
      * @param projectName the project name
+     * @return this for call chaining
      */
     public Gal16v8CuplExporter setProjectName(String projectName) {
         this.projectName = projectName;
@@ -156,10 +157,16 @@ public class Gal16v8CuplExporter implements ExpressionExporter<Gal16v8CuplExport
         out.flush();
     }
 
+    @Override
+    public void writeTo(OutputStream out) throws FuseMapFillerException, IOException, PinMapException {
+        writeTo(new OutputStreamWriter(out, "ISO-8859-1"));
+    }
+
     /**
      * Is called if header is written
      *
      * @param out the writer
+     * @throws IOException IOException
      */
     protected void headerWritten(Writer out) throws IOException {
     }
@@ -169,15 +176,11 @@ public class Gal16v8CuplExporter implements ExpressionExporter<Gal16v8CuplExport
      *
      * @param out  Writer
      * @param name name of variable
+     * @throws IOException IOException
      */
     protected void sequentialWritten(Writer out, String name) throws IOException {
     }
 
-    @Override
-    public void writeTo(OutputStream out) throws FuseMapFillerException, IOException, PinMapException {
-        writeTo(new OutputStreamWriter(out, "ISO-8859-1"));
-    }
-
     private final class CuplBuilder extends BuilderCollector {
         private final NotAllowedVariablesVisitor notAllowedVariablesVisitor = new NotAllowedVariablesVisitor();
 
diff --git a/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10CuplExporter.java b/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10CuplExporter.java
index a4a837290..ec02e9059 100644
--- a/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10CuplExporter.java
+++ b/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10CuplExporter.java
@@ -35,13 +35,13 @@ public class Gal22v10CuplExporter extends Gal16v8CuplExporter {
 
     @Override
     protected void headerWritten(Writer out) throws IOException {
-        out.write("\r\nar = 'b'0 ;\r\n" +
-                "sp = 'b'0 ;\r\n");
+        out.write("\r\nar = 'b'0 ;\r\n"
+                + "sp = 'b'0 ;\r\n");
     }
 
     @Override
     protected void sequentialWritten(Writer out, String name) throws IOException {
-        out.write(name+".ar = ar ;\r\n");
-        out.write(name+".sp = sp ;\r\n");
+        out.write(name + ".ar = ar ;\r\n");
+        out.write(name + ".sp = sp ;\r\n");
     }
 }
diff --git a/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10JEDECExporter.java b/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10JEDECExporter.java
index b522f4bdc..e8b82a1e6 100644
--- a/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10JEDECExporter.java
+++ b/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10JEDECExporter.java
@@ -17,8 +17,8 @@ import java.io.OutputStream;
  * @author hneemann
  */
 public class Gal22v10JEDECExporter implements ExpressionExporter<Gal22v10JEDECExporter> {
-    private static final int[] productsByOLMC = new int[]{8, 10, 12, 14, 16, 16, 14, 12, 10, 8};
-    private static final int[] oeFuseNumByOLMC = new int[]{44, 440, 924, 1496, 2156, 2904, 3652, 4312, 4884, 5368};
+    private static final int[] PRODUCTS_BY_OLMC = new int[]{8, 10, 12, 14, 16, 16, 14, 12, 10, 8};
+    private static final int[] OE_FUSE_NUM_BY_OLMC = new int[]{44, 440, 924, 1496, 2156, 2904, 3652, 4312, 4884, 5368};
     private static final int S0 = 5808;
     private static final int S1 = 5809;
     private final FuseMap map;
@@ -71,14 +71,14 @@ public class Gal22v10JEDECExporter implements ExpressionExporter<Gal22v10JEDECEx
 
         for (String o : builder.getOutputs()) {
             int olmc = 23 - pinMap.getOutputFor(o);
-            int offs = oeFuseNumByOLMC[olmc];
+            int offs = OE_FUSE_NUM_BY_OLMC[olmc];
             for (int j = 0; j < 44; j++) map.setFuse(offs + j); // turn on OE
             map.setFuse(S0 + olmc * 2);                         // set olmc to active high
             if (builder.getCombinatorial().containsKey(o)) {
                 map.setFuse(S1 + olmc * 2);
-                filler.fillExpression(offs + 44, builder.getCombinatorial().get(o), productsByOLMC[olmc]);
+                filler.fillExpression(offs + 44, builder.getCombinatorial().get(o), PRODUCTS_BY_OLMC[olmc]);
             } else if (builder.getRegistered().containsKey(o)) {
-                filler.fillExpression(offs + 44, builder.getRegistered().get(o), productsByOLMC[olmc]);
+                filler.fillExpression(offs + 44, builder.getRegistered().get(o), PRODUCTS_BY_OLMC[olmc]);
             } else
                 throw new FuseMapFillerException("variable " + o + " not found!");
         }