diff --git a/src/de/inetsoftware/jwebassembly/module/CodeOptimizer.java b/src/de/inetsoftware/jwebassembly/module/CodeOptimizer.java
new file mode 100644
index 0000000..1876b6a
--- /dev/null
+++ b/src/de/inetsoftware/jwebassembly/module/CodeOptimizer.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2019 Volker Berlin (i-net software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+package de.inetsoftware.jwebassembly.module;
+
+import java.util.List;
+
+/**
+ * Optimize the code of a single method/function through using of WebAssembly features without equivalent in Java.
+ * 
+ * @author Volker Berlin
+ */
+class CodeOptimizer {
+
+    /**
+     * Optimize the code before writing.
+     * 
+     * @param instructions
+     *            the list of instructions
+     */
+    public void optimze( List<WasmInstruction> instructions ) {
+        for( int i = instructions.size()-1; i >= 0; i-- ) {
+            WasmInstruction instr = instructions.get( i );
+            switch( instr.getType() ) {
+                case Local:
+                    break;
+                default:
+            }
+        }
+
+    }
+
+}
diff --git a/src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java b/src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java
index 8886faf..620fcd5 100644
--- a/src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java
+++ b/src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java
@@ -66,6 +66,8 @@ public class ModuleGenerator {
 
     private TypeManager                     types = new TypeManager();
 
+    private CodeOptimizer                   optimizer = new CodeOptimizer();
+
     /**
      * Create a new generator.
      * 
@@ -304,9 +306,11 @@ public class ModuleGenerator {
     private void writeMethodImpl( FunctionName name, boolean isStatic, LocalVariableTable localVariableTable, WasmCodeBuilder codeBuilder ) throws WasmException, IOException {
         writer.writeMethodStart( name );
         functions.writeFunction( name );
-        writeMethodSignature( name, isStatic, localVariableTable, codeBuilder ); 
+        writeMethodSignature( name, isStatic, localVariableTable, codeBuilder );
 
-        for( WasmInstruction instruction : codeBuilder.getInstructions() ) {
+        List<WasmInstruction> instructions = codeBuilder.getInstructions();
+        optimizer.optimze( instructions );
+        for( WasmInstruction instruction : instructions ) {
             switch( instruction.getType() ) {
                 case Call:
                     functions.functionCall( ((WasmCallInstruction)instruction).getFunctionName() );