diff --git a/src/main.cpp b/src/main.cpp
index 739ff17..6bad296 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -215,8 +215,8 @@ int main(int argc, char* argv[])
       if(options['J'])
       {
         std::cout << gen_json_struc(sh) << std::endl;
-        goto end;
       }
+      else
   #endif
 
       if(options['o']) // file output
@@ -259,8 +259,6 @@ int main(int argc, char* argv[])
     std::cerr << e.what() << std::endl;
     return ERR_RUNTIME;
   }
-end:
-
   delete sh;
 
   return ret;
diff --git a/src/minify.cpp b/src/minify.cpp
index e28ae7d..e8a310a 100644
--- a/src/minify.cpp
+++ b/src/minify.cpp
@@ -500,4 +500,5 @@ void minify_generic(_obj* in)
 {
   recurse(r_minify_empty_manip, in);
   recurse(r_minify_single_block, in);
+  minify_quotes(in);
 }
diff --git a/src/options.cpp b/src/options.cpp
index 25418c3..1cc003e 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -26,8 +26,7 @@ ztd::option_set options( {
 #endif
   ztd::option("\r  [Processing]"),
   ztd::option('m', "minify",        false, "Minify code without changing functionality"),
-  ztd::option('M', "minify-full",   false, "Enable all minifying features: -m --minify-quotes --minify-var --minify-fct --remove-unused"),
-  ztd::option("minify-quotes",      false, "Remove unnecessary quotes"),
+  ztd::option('M', "minify-full",   false, "Enable all minifying features: -m --minify-var --minify-fct --remove-unused"),
   ztd::option('C', "no-cd",         false, "Don't cd when doing %include and %resolve"),
   ztd::option('I', "no-include",    false, "Don't resolve %include commands"),
   ztd::option('R', "no-resolve",    false, "Don't resolve %resolve commands"),
@@ -72,7 +71,6 @@ void get_opts()
     options['m'].activated=true;
     options["minify-var"].activated=true;
     options["minify-fct"].activated=true;
-    options["minify-quotes"].activated=true;
     options["remove-unused"].activated=true;
   }
 }
diff --git a/src/processing.cpp b/src/processing.cpp
index 6b95d29..711f497 100644
--- a/src/processing.cpp
+++ b/src/processing.cpp
@@ -511,8 +511,8 @@ bool r_do_string_processor(_obj* in)
         require_rescan_all();
         if(options["remove-unused"])
           delete_unused( tsh, re_var_exclude, re_fct_exclude );
-        if(options["minify-quotes"])
-          minify_quotes(tsh);
+        if(options["minify"])
+          minify_generic(tsh);
         if(options["minify-var"])
           minify_var( tsh, re_var_exclude );
         if(options["minify-fct"])