diff --git a/src/entify.js b/src/entify.js
index fa5b6da..ab9fdfe 100644
--- a/src/entify.js
+++ b/src/entify.js
@@ -1,7 +1,6 @@
 /**
  * Enforce entity characters for textarea content.
- * By default, this also does basic minification before setting entities.
- * For full minification, pass `minify_content` as `true`.
+ * To also minifiy, pass `minify` as `true`.
  * 
  * @param {string} html The HTML string to evaluate.
  * @param {boolean} [minify] Fully minifies the content of textarea elements. 
@@ -11,31 +10,20 @@
  * @example <textarea>3 > 2</textarea> => <textarea>3 &gt; 2</textarea>
  */
 export const entify = (html, minify = false) => {
-  /* Trim any combination of leading line returns and/or spaces. */
-  html = html
-    .replace(/(<textarea[^>]*>)\n+/g, '$1')
-    .replace(/(<textarea[^>]*>)\n\s+/g, '$1')
-    .replace(/(<textarea[^>]*>)\s+\n/g, '$1')
-
-  /* Trim trailing spaces */
-  html = html.replace(/\s+<\/textarea>/g, '</textarea>')
-
   /** 
-   * Protect entities, inside the textarea content,
-   * from general minification.
+   * Use entities inside textarea content.
    */
   html = html.replace(/<textarea[^>]*>((.|\n)*?)<\/textarea>/g, (match, capture) => {
     return match.replace(capture, (match) => {
       return match
+        .replace(/&/g, '&amp;')
         .replace(/</g, '&lt;')
         .replace(/>/g, '&gt;')
-        .replace(/\//g, '&#47;')
-        .replace(/"/g, '&#34;')
-        .replace(/'/g, '&#39;')
-        .replace(/\n/g, '&#13;')
-        .replace(/%/g, '&#37;')
-        .replace(/\{/g, '&#123;')
-        .replace(/\}/g, '&#125;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&apos;')
+        .replace(/\n/g, '&#10;')
+        .replace(/\r/g, '&#13;')
+        .replace(/\s/g, '&nbsp;')
     })
   })