diff --git a/src/format/format.cpp b/src/format/format.cpp
index afb99f8..1be57dc 100644
--- a/src/format/format.cpp
+++ b/src/format/format.cpp
@@ -1,31 +1,7 @@
 #include "format/format.hpp"
 #include "markdown/markdown.hpp"
-#include <iostream>
 #include <string>
 
-// Replace TEMPLATE with REPLACMENT in-place
-static bool replace_once_global(std::string &STR, const std::string &TEMPLATE,
-                                const std::string &REPLACMENT) {
-  size_t start_pos = STR.find(TEMPLATE);
-  if (start_pos == std::string::npos) {
-    return false;
-  }
-  STR.replace(start_pos, TEMPLATE.length(), REPLACMENT);
-  return true;
-}
-
-// Replace TEMPLATE with REPLACMENT between starting from `start`
-static bool replace_once_between(std::string &STR, const std::string &TEMPLATE,
-                                 const std::string &REPLACMENT,
-                                 const size_t &START) {
-  size_t start_pos = STR.find(TEMPLATE, START);
-  if (start_pos == std::string::npos) {
-    return false;
-  }
-  STR.replace(start_pos, TEMPLATE.length(), REPLACMENT);
-  return true;
-}
-
 // Remove everything from START to STOP
 static bool remove_from_to(std::string &STR, const std::string &START,
                            const std::string &STOP) {
@@ -45,46 +21,51 @@ static bool remove_from_to(std::string &STR, const std::string &START,
 
 std::string format_file(const std::string &TEMPLATE_FILE,
                         const std::string &TEMPLATE, const std::string &INPUT) {
-  bool is_template = TEMPLATE_FILE.find(TEMPLATE) != std::string::npos;
   std::string result = TEMPLATE_FILE;
+  size_t current_pos = 0;
 
-  if (!is_template) {
-    std::clog << "There is no template in given file. Is this correct?"
-              << std::endl;
-    return result;
-  }
+  while (true) {
+    size_t found_pos = result.find(TEMPLATE, current_pos);
 
-  while (is_template) {
-    is_template = replace_once_global(result, TEMPLATE, INPUT);
-  }
-  return result;
-}
-
-std::string format_file_condtionally(const std::string &TEMPLATE_FILE,
-                                     const std::string &TEMPLATE,
-                                     const std::string &INPUT) {
-
-  size_t template_pos = TEMPLATE_FILE.find(TEMPLATE);
-  bool is_template = template_pos != std::string::npos;
-
-  std::string result = TEMPLATE_FILE;
-
-  if (!is_template) {
-    std::clog << "There is no template in given file. Is this correct?"
-              << std::endl;
-    return result;
-  }
-
-  // if template is empty then we remove everything in between
-  if (TEMPLATE == "") {
-    while (is_template) {
-      is_template = remove_from_to(result, TEMPLATE, "{{endif}");
+    if (found_pos == std::string::npos) {
+      break;
     }
-  }
 
-  while (is_template) {
-    is_template =
-        replace_once_between(result, TEMPLATE, INPUT, result.find(TEMPLATE));
+    result.replace(found_pos, TEMPLATE.length(), INPUT);
+    current_pos = found_pos + INPUT.length();
   }
   return result;
 }
+
+std::string format_file_conditionally(const std::string &TEMPLATE_FILE,
+                                      const std::string &START_TAG,
+                                      const std::string &END_TAG,
+                                      const std::string &TEMPLATE,
+                                      const std::string &INPUT) {
+  std::string result = TEMPLATE_FILE;
+
+  if (INPUT.empty()) {
+    while (true) {
+      if (!remove_from_to(result, START_TAG, END_TAG)) {
+        break;
+      }
+    }
+  } else {
+    // remove START tag
+    size_t pos = 0;
+    while ((pos = result.find(START_TAG, pos)) != std::string::npos) {
+      result.replace(pos, START_TAG.length(), "");
+    }
+
+    // remove END tag
+    pos = 0;
+    while ((pos = result.find(END_TAG, pos)) != std::string::npos) {
+      result.replace(pos, END_TAG.length(), "");
+    }
+
+    // replace
+    result = format_file(result, TEMPLATE, INPUT);
+  }
+
+  return result;
+}
diff --git a/src/format/format.hpp b/src/format/format.hpp
index 8f04037..78bf316 100644
--- a/src/format/format.hpp
+++ b/src/format/format.hpp
@@ -14,6 +14,8 @@ std::string format_file(const std::string &TEMPLATE_FILE,
 // @param TEMPLATE_FILE File that you want to format in string.
 // @param TEMPLATE Full name of the if statement. For example `{{if title}}`
 // @return Formatted file in std::string
-std::string format_file_condtionally(const std::string &TEMPLATE_FILE,
-                                     const std::string &TEMPLATE,
-                                     const std::string &INPUT);
+std::string format_file_conditionally(const std::string &TEMPLATE_FILE,
+                                      const std::string &START_TAG,
+                                      const std::string &END_TAG,
+                                      const std::string &TEMPLATE,
+                                      const std::string &INPUT);
diff --git a/src/tests.cpp b/src/tests.cpp
index 8f82fde..c2bc76d 100644
--- a/src/tests.cpp
+++ b/src/tests.cpp
@@ -43,6 +43,46 @@ constexpr const char *formated_html = R"(<!DOCTYPE html>
 </body>
 </html>)";
 
+constexpr const char *formatter_html_conditionally = R"(<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+{{if tag}}
+    <p>{{tag}}</p>
+{{endif}}
+</body>
+</html>)";
+
+constexpr const char *formated_html_conditionally = R"(<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+
+    <p>tag</p>
+
+</body>
+</html>)";
+
+constexpr const char *formated_html_conditionally_empty = R"(<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+
+</body>
+</html>)";
+
 constexpr const char *no_metadata_post_md = R"(# This markdown has no metadata.
 That's bad. Don't do it. It's for tests only.)";
 
@@ -183,3 +223,21 @@ TEST_CASE("Test format_file function with correct data") {
                                                   "{{replace_me}}",
                                                   "I'm formatted!"));
 }
+
+TEST_CASE("Test format_file function with no templates") {
+  REQUIRE(TestFiles::formated_html ==
+          format_file(TestFiles::formated_html, "{{replace_me}}", "nothing"));
+}
+
+TEST_CASE("Test format_file_conditionally with tag") {
+  REQUIRE(TestFiles::formated_html_conditionally ==
+          format_file_conditionally(TestFiles::formatter_html_conditionally,
+                                    "{{if tag}}", "{{endif}}", "{{tag}}",
+                                    "tag"));
+}
+
+TEST_CASE("Test format_file_conditionally with empty tag") {
+  REQUIRE(TestFiles::formated_html_conditionally_empty ==
+          format_file_conditionally(TestFiles::formatter_html_conditionally,
+                                    "{{if tag}}", "{{endif}}", "{{tag}}", ""));
+}