2 files changed, 5 insertions, 10 deletions
diff --git a/assets/javascript/core/exercise.js b/assets/javascript/core/exercise.js
index c181732..66e1dd2 100644
--- a/assets/javascript/core/exercise.js
+++ b/assets/javascript/core/exercise.js
@@ -6,8 +6,8 @@ define([
 ], function($, execute, analytic, state){
     // Bind an exercise
     var prepareExercise = function($exercise) {
-        var codeSolution = $exercise.find(".code-solution").html();
-        var codeValidation = $exercise.find(".code-validation").html();
+        var codeSolution = $exercise.find(".code-solution").text();
+        var codeValidation = $exercise.find(".code-validation").text();
 
         var editor = ace.edit($exercise.find(".editor").get(0));
         editor.setTheme("ace/theme/tomorrow");
diff --git a/assets/javascript/utils/execute.js b/assets/javascript/utils/execute.js
index 9bc8cd0..61354b8 100644
--- a/assets/javascript/utils/execute.js
+++ b/assets/javascript/utils/execute.js
@@ -65,17 +65,12 @@ define(function(){
     };
 
 
-    var ass = "function assert(condition, message) { \nif (!condition) { \n throw message || \"Assertion failed\"; \n } \n }\n";
-
-    var code = {
-        "base": "var firstName = \"John\";\nvar middleName = \"James\";\nvar lastName = \"Smith\";\n\nvar fullName =",
-        "solution": "var firstName = \"John\";\nvar middleName = \"James\";\nvar lastName = \"Smith\";\n\nvar fullName = firstName + \" \" + middleName + \" \" + lastName;",
-        "validation": "console.log(fullName); assert(fullName == 'John James Smith');"
-    };    
+    var ass = "function assert(condition, message) { \nif (!condition) { \n throw message || \"Assertion failed\"; \n } \n }\n";   
 
     var execute = function(solution, validation, callback) {
         // Validate with validation code
-        evalJS([solution, ass, validation].join(";\n"), function(err, res) {
+        var code = [solution, ass, validation].join(";\n");
+        evalJS(code, function(err, res) {
             if(err) return callback(err);
 
             if (res.type == "error") callback(new Error(res.value));