diff --git a/chapter-02-the-open-closed-principle/refactor/genericEncoder.js b/chapter-02-the-open-closed-principle/refactor/genericEncoder.js
index 26af3a0..316c906 100644
--- a/chapter-02-the-open-closed-principle/refactor/genericEncoder.js
+++ b/chapter-02-the-open-closed-principle/refactor/genericEncoder.js
@@ -2,8 +2,6 @@ function genericEncoder(encoderFactory) {
     function encodeToFormat(data, format) {
         const encoder = encoderFactory.createForFormat(format);
 
-        data = encoderFactory.prepareData(data);
-
         return encoder.encode(data);
     }
 
diff --git a/chapter-02-the-open-closed-principle/refactor/jsonEncoder.js b/chapter-02-the-open-closed-principle/refactor/jsonEncoder.js
index cdff622..adbb116 100644
--- a/chapter-02-the-open-closed-principle/refactor/jsonEncoder.js
+++ b/chapter-02-the-open-closed-principle/refactor/jsonEncoder.js
@@ -1,5 +1,7 @@
 function jsonEncoder() {
-    function encode() {
+    function encode(data) {
+        data = prepareData(data);
+
         // something here...
     }
 
@@ -14,7 +16,6 @@ function jsonEncoder() {
 
     return {
         encode,
-        prepareData,
     };
 }
 
diff --git a/chapter-02-the-open-closed-principle/refactor/xmlEncoder.js b/chapter-02-the-open-closed-principle/refactor/xmlEncoder.js
index 13d8f58..2f7a7b3 100644
--- a/chapter-02-the-open-closed-principle/refactor/xmlEncoder.js
+++ b/chapter-02-the-open-closed-principle/refactor/xmlEncoder.js
@@ -1,5 +1,7 @@
 function xmlEncoder() {
     function encode() {
+        data = prepareData(data);
+
         // something here...
     }
 
@@ -13,7 +15,6 @@ function xmlEncoder() {
 
     return {
         encode,
-        prepareData,
     };
 }
 
diff --git a/chapter-02-the-open-closed-principle/refactor/yamlEncoder.js b/chapter-02-the-open-closed-principle/refactor/yamlEncoder.js
index 342fce9..4989edd 100644
--- a/chapter-02-the-open-closed-principle/refactor/yamlEncoder.js
+++ b/chapter-02-the-open-closed-principle/refactor/yamlEncoder.js
@@ -1,5 +1,7 @@
 function yamlEncoder() {
-    function encode() {
+    function encode(data) {
+        data = prepareData(data);
+
         // something here...
     }
 
@@ -9,7 +11,6 @@ function yamlEncoder() {
 
     return {
         encode,
-        prepareData,
     };
 }