diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..88bf97c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false
\ No newline at end of file
diff --git a/src/CodeConverter.php b/src/CodeConverter.php
index 2be865a..ce3502b 100644
--- a/src/CodeConverter.php
+++ b/src/CodeConverter.php
@@ -2,117 +2,113 @@
 
 namespace Corviz\Crow;
 
-final class CodeConverter
-{
-    /**
-     * @var array
-     */
-    private array $methods = [];
-
-    /**
-     * @param string $templateCode
-     *
-     * @return string
-     */
-    public function toPhp(string $templateCode): string
-    {
-        while($this->convertMethods($templateCode, 'extends|include'));
-        while($this->convertMethods($templateCode));
-        $this->convertComments($templateCode);
-        $this->convertEscaped($templateCode);
-        $this->convertUnescaped($templateCode);
-
-        return $templateCode;
-    }
+final class CodeConverter {
+  /**
+   * @var array
+   */
+  private array $methods = [];
 
-    /**
-     * @param string $method
-     * @param string $class
-     *
-     * @return void
-     */
-    public function addMethod(string $method, string $class): void
-    {
-        $this->methods[$method] = ['c' => $class, 'i' => null];
-    }
+  /**
+   * @param string $templateCode
+   *
+   * @return string
+   */
+  public function toPhp(string $templateCode): string {
+    while ($this->convertMethods($templateCode, 'extends|include'));
+    while ($this->convertMethods($templateCode));
+    $this->convertComments($templateCode);
+    $this->convertEscaped($templateCode);
+    $this->convertUnescaped($templateCode);
 
-    /**
-     * @param string $templateCode
-     *
-     * @return void
-     */
-    private function convertEscaped(string &$templateCode): void
-    {
-        $templateCode = preg_replace(
-            '/{{(.*?)}}/',
-            '<?php echo htmlentities(($1) ?? null) ?>',
-            $templateCode
-        );
-    }
+    return $templateCode;
+  }
 
-    /**
-     * @param string $templateCode
-     * @return void
-     */
-    private function convertUnescaped(string &$templateCode): void
-    {
-        $templateCode = preg_replace(
-            '/{!!(.*?)!!}/',
-            '<?php echo ($1) ?? null ?>',
-            $templateCode
-        );
-    }
+  /**
+   * @param string $method
+   * @param string $class
+   *
+   * @return void
+   */
+  public function addMethod(string $method, string $class): void {
+    $this->methods[$method] = ['c' => $class, 'i' => null];
+  }
 
-    /**
-     * @param string $templateCode
-     * @return void
-     */
-    private function convertComments(string &$templateCode): void
-    {
-        $templateCode = preg_replace(
-            '/{{--(.*?)--}}/',
-            '<?php /** $1 */ ?>',
-            $templateCode
-        );
-    }
+  /**
+   * @param string $templateCode
+   *
+   * @return void
+   */
+  private function convertEscaped(string &$templateCode): void {
+    $templateCode = preg_replace(
+      '/{{(.*?)}}/',
+      '<?php echo htmlentities(($1) ?? null) ?>',
+      $templateCode
+    );
+  }
 
-    /**
-     * @param string $templateCode
-     * @return int
-     */
-    private function convertMethods(string &$templateCode, string $tag = null): int
-    {
-        $count = 0;
-
-        if (is_null($tag)) {
-            $methods = array_keys($this->methods);
-            //Evaluate longer named methods first
-            usort($methods, function ($a, $b) {
-                return strlen($b) <=> strlen($a);
-            });
-            $tag = implode('|', $methods);
-        }
+  /**
+   * @param string $templateCode
+   * @return void
+   */
+  private function convertUnescaped(string &$templateCode): void {
+    $templateCode = preg_replace(
+      '/{!!(.*?)!!}/',
+      '<?php echo ($1) ?? null ?>',
+      $templateCode
+    );
+  }
 
-        $templateCode = preg_replace_callback(
-            '/@('.$tag.')\s*(\(((?:[^()]++|(\g<2>))*)\))?/m',
-            function($match){
-                if (isset($this->methods[$match[1]])) {
-                    if (!$this->methods[$match[1]]['i']) {
-                        $this->methods[$match[1]]['i'] = $this->methods[$match[1]]['c']::create();
-                    }
+  /**
+   * @param string $templateCode
+   * @return void
+   */
+  private function convertComments(string &$templateCode): void {
+    $templateCode = preg_replace(
+      // '/{{--(.*?)--}}/s', // old
+      '/{{--\s*(.*?)\s*--}}/s',
+      '<?php /** $1 */ ?>',
+      $templateCode
+    );
+  }
 
-                    /* @var $method Method */
-                    $method = $this->methods[$match[1]]['i'];
+  /**
+   * @param string $templateCode
+   * @return int
+   */
+  private function convertMethods(string &$templateCode, string|null $tag = null): int {
+    $count = 0;
 
-                    return $method->toPhpCode($match[3] ?? null);
-                }
+    if (is_null($tag)) {
+      $methods = array_keys($this->methods);
 
-                return $match[0];
-            },
-            $templateCode,
-            count: $count
-        );
+      // Evaluate longer named methods first
+      usort($methods, function ($a, $b) {
+        return strlen($b) <=> strlen($a);
+      });
 
-        return $count;
+      $tag = implode('|', $methods);
     }
+
+    $templateCode = preg_replace_callback(
+      '/@(' . $tag . ')\s*(\(((?:[^()]++|(\g<2>))*)\))?/m',
+      function ($match) {
+        if (isset($this->methods[$match[1]])) {
+          if (!$this->methods[$match[1]]['i']) {
+            $this->methods[$match[1]]['i'] = $this->methods[$match[1]]['c']::create();
+          }
+
+          /* @var $method Method */
+          $method = $this->methods[$match[1]]['i'];
+
+          return $method->toPhpCode($match[3] ?? null);
+        }
+
+        return $match[0];
+      },
+      $templateCode,
+      count: $count
+    );
+
+    return $count;
+  }
 }
diff --git a/src/Component.php b/src/Component.php
index b1fa7cf..9f321b2 100644
--- a/src/Component.php
+++ b/src/Component.php
@@ -4,87 +4,95 @@
 
 use Corviz\Crow\Traits\SelfCreate;
 
-abstract class Component
-{
-    use SelfCreate;
-
-    /**
-     * @var string|null
-     */
-    protected ?string $templatesPath = null;
-
-    /**
-     * @var string|null
-     */
-    protected ?string $extension = Crow::DEFAULT_EXTENSION;
-
-    /**
-     * @var array
-     */
-    private array $attributes = [];
-
-    /**
-     * @var string|null
-     */
-    private ?string $contents = null;
-
-    /**
-     * @return array
-     */
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
+abstract class Component {
+  use SelfCreate;
 
-    /**
-     * @return string|null
-     */
-    public function getContents(): ?string
-    {
-        return $this->contents;
-    }
+  /**
+   * @var string|null
+   */
+  protected ?string $templatesPath = null;
 
-    /**
-     * @param array $attributes
-     * @return Component
-     */
-    public function setAttributes(array $attributes): Component
-    {
-        $this->attributes = $attributes;
-        return $this;
-    }
+  /**
+   * @var string|null
+   */
+  protected ?string $extension = Crow::DEFAULT_EXTENSION;
 
-    /**
-     * @param string|null $contents
-     * @return Component
-     */
-    public function setContents(?string $contents): Component
-    {
-        $this->contents = $contents;
-        return $this;
-    }
+  /**
+   * @var array
+   */
+  private array $attributes = [];
+
+  /**
+   * @var string|null
+   */
+  private ?string $contents = null;
+
+  /**
+   * @return array
+   */
+  public function getAttributes(): array {
+    return $this->attributes;
+  }
+
+  /**
+   * @return string|null
+   */
+  public function getContents(): ?string {
+    return $this->contents;
+  }
+
+  protected function getAttributesParsed() {
+    $attrs = "";
 
-    /**
-     * @return void
-     */
-    abstract public function render(): void;
-
-    /**
-     * @param string $file
-     * @param array $data
-     *
-     * @return void
-     */
-    protected function view(string $file, array $data = []): void
-    {
-        $data = $data + get_object_vars($this) + [
-            'contents' => $this->getContents(),
-            'attributes' => $this->getAttributes(),
-        ];
-        $oldExt = Crow::getExtension();
-
-        Crow::setExtension($this->extension);
-        Crow::render($file, $data, $this->templatesPath);
-        Crow::setExtension($oldExt);
+    foreach ($this->getAttributes() as $a => $v) {
+      $v = in_array(gettype($v), ["array","object"]) ? json_encode($v, JSON_UNESCAPED_UNICODE) : $v;
+      $attrs .= "{$a}='{$v}' ";
     }
+
+    return $attrs;
+  }
+
+  /**
+   * @param array $attributes
+   * @return Component
+   */
+  public function setAttributes(array $attributes): Component {
+    $this->attributes = $attributes;
+    return $this;
+  }
+
+  /**
+   * @param string|null $contents
+   * @return Component
+   */
+  public function setContents(?string $contents): Component {
+    $this->contents = $contents;
+    return $this;
+  }
+
+  /**
+   * @return void
+   */
+  abstract public function render(): void;
+
+  /**
+   * @param string $file
+   * @param array $data
+   *
+   * @return void
+   */
+  protected function view(string $file, array $data = [], $extension = null): void {
+    $data = $data + get_object_vars($this) + [
+      'contents'          => $this->getContents(),
+      'attributes'        => $this->getAttributes(),
+      'attributesParsed'  => $this->getAttributesParsed(),
+    ];
+
+    $extension ??= $this->extension;
+    $oldExt = Crow::getExtension();
+
+    Crow::setExtension($extension);
+    Crow::render($file, $data, $this->templatesPath);
+    Crow::setExtension($oldExt);
+  }
 }
diff --git a/src/ComponentConverter.php b/src/ComponentConverter.php
index 7232bd7..8fd4af8 100644
--- a/src/ComponentConverter.php
+++ b/src/ComponentConverter.php
@@ -5,171 +5,158 @@
 use Corviz\Crow\Traits\SelfCreate;
 use Exception;
 
-class ComponentConverter
-{
-    use SelfCreate;
-
-    /**
-     * @var array
-     */
-    private array $namespacesMap = [];
-
-    /**
-     * @var string
-     */
-    private string $componentsNamespace;
-
-    /**
-     * @param string $namespace
-     * @param string $prefix
-     * @return ComponentConverter
-     * @throws Exception
-     */
-    public function addComponentsNamespace(string $namespace, string $prefix = 'default'): ComponentConverter
-    {
-        if (isset($this->namespacesMap[$prefix])) {
-            throw new Exception("The prefix '$prefix' is registered already");
-        }
-
-        $this->namespacesMap[$prefix] = trim($namespace, '\\');
-        return $this;
+class ComponentConverter {
+  use SelfCreate;
+
+  /**
+   * @var array
+   */
+  private array $namespacesMap = [];
+
+  /**
+   * @var string
+   */
+  private string $componentsNamespace;
+
+  /**
+   * @param string $namespace
+   * @param string $prefix
+   * @return ComponentConverter
+   * @throws Exception
+   */
+  public function addComponentsNamespace(string $namespace, string $prefix = 'default'): ComponentConverter {
+    if (isset($this->namespacesMap[$prefix])) {
+      throw new Exception("The prefix '$prefix' is registered already");
     }
 
-    /**
-     * @param string $componentsNamespace
-     *
-     * @return ComponentConverter
-     */
-    public function setComponentsNamespace(string $componentsNamespace): ComponentConverter
-    {
-        return $this->addComponentsNamespace($componentsNamespace);
-    }
+    $this->namespacesMap[$prefix] = trim($namespace, '\\');
+    return $this;
+  }
+
+  /**
+   * @param string $componentsNamespace
+   *
+   * @return ComponentConverter
+   */
+  public function setComponentsNamespace(string $componentsNamespace): ComponentConverter {
+    return $this->addComponentsNamespace($componentsNamespace);
+  }
+
+  /**
+   * @param string $template
+   *
+   * @return void
+   */
+  public function toPhp(string &$template): void {
+    do {
+      $count = 0;
+      $template = preg_replace_callback(
+        '/<(x-[\w.-]+)([^\/>]*?)(\/>|>((?:(?!<\/?\1\b).|(?R))*)<\/\1>)/s',
+        function ($match) {
+          $code = "";
+          $componentClassName = $this->getComponentClass($match[1]);
+          $contents = $match[4] ?? null;
+
+          $attrsArrayCode = $this->attrsStringToArrayCode($match[2] ?? null);
+
+          if (class_exists($componentClassName)) {
+            if ($contents) {
+              $code .= "<?php ob_start(); ?>$contents<?php \$__componentContents = ob_get_contents(); ob_end_clean(); ?>";
+            }
 
-    /**
-     * @param string $template
-     *
-     * @return void
-     */
-    public function toPhp(string &$template): void
-    {
-        do {
-            $count = 0;
-            $template = preg_replace_callback(
-                '/<(x-[\w.-]+)([^\/>]*?)(\/>|>((?:(?!<\/?\1\b).|(?R))*)<\/\1>)/s',
-                function($match) {
-                    $code = "";
-                    $componentClassName = $this->getComponentClass($match[1]);
-                    $contents = $match[4] ?? null;
-
-                    $attrsArrayCode = $this->attrsStringToArrayCode($match[2] ?? null);
-
-                    if (class_exists($componentClassName)) {
-                        if ($contents) {
-                            $code .= "<?php ob_start(); ?>$contents<?php \$__componentContents = ob_get_contents(); ob_end_clean(); ?>";
-                        }
-                        $code .= "<?php ";
-                        $code .= "\$__component = $componentClassName::create()";
-                        $code .= "->setAttributes($attrsArrayCode)";
-                        if ($contents) {
-                            $code .= "->setContents(\$__componentContents)";
-                        }
-                        $code .= "->render();";
-                        $code .= " ?>";
-                    } else {
-                        $code .= "Component class not found: $componentClassName";
-                    }
-
-                    return $code;
-                },
-                $template,
-                count: $count
-            );
-        } while ($count > 0);
-    }
+            $code .= "<?php ";
+            $code .= "\$__component = $componentClassName::create()";
+            $code .= "->setAttributes($attrsArrayCode)";
 
-    /**
-     * @param string $str
-     *
-     * @return string
-     */
-    private function dashToUpperCamelCase(string $str)
-    {
-        return ucfirst($this->dashToCamelCase($str));
-    }
+            if ($contents) {
+              $code .= "->setContents(\$__componentContents)";
+            }
 
-    /**
-     * @param string $str
-     *
-     * @return string
-     */
-    private function dashToCamelCase(string $str): string
-    {
-        return preg_replace_callback('/-(\w)/', function($match){
-            return mb_strtoupper($match[1]);
-        }, $str);
+            $code .= "->render();";
+            $code .= " ?>";
+          }
+          else {
+            $code .= "Component class not found: $componentClassName";
+          }
+
+          return $code;
+        },
+        $template,
+        count: $count
+      );
+    } while ($count > 0);
+  }
+
+  /**
+   * @param string $str
+   *
+   * @return string
+   */
+  private function dashToUpperCamelCase(string $str) {
+    return ucfirst($this->dashToCamelCase($str));
+  }
+
+  /**
+   * @param string $str
+   *
+   * @return string
+   */
+  private function dashToCamelCase(string $str): string {
+    return preg_replace_callback('/-(\w)/', function ($match) {
+      return mb_strtoupper($match[1]);
+    }, $str);
+  }
+
+  /**
+   * @param string|null $componentAttrs
+   *
+   * @return string
+   */
+  private function attrsStringToArrayCode(?string $componentAttrs): string {
+    $code = '[';
+
+    if (!is_null($componentAttrs)) {
+      $re = '/(:?\w+)(=("[^"]+"))?/s';
+
+      preg_match_all($re, $componentAttrs, $matches, PREG_SET_ORDER);
+
+      foreach ($matches as $match) {
+        $has_placeholder = str_starts_with($match[1], ':');
+        $index = $has_placeholder ? substr($match[1], 1) : $match[1]; // $this->dashToCamelCase($match[1]);
+        $value = $match[3] ? ($has_placeholder ? trim($match[3], "\"'") : $match[3]) : "''";
+
+        $code .= "'$index' => $value, ";
+      }
     }
 
-    /**
-     * @param string|null $componentAttrs
-     *
-     * @return string
-     */
-    private function attrsStringToArrayCode(?string $componentAttrs): string
-    {
-        $code = '[';
-
-        if (!is_null($componentAttrs)) {
+    $code .= ']';
 
-            $re = '/((:?)((\w|-)+))(="((?:[^"]++|\g<4>)(.*?))")?/s';
+    return $code;
+  }
 
-            preg_match_all($re, $componentAttrs, $matches, PREG_SET_ORDER);
+  /**
+   * @param string $componentTagName
+   *
+   * @return string|null
+   */
+  private function getComponentClass(string $componentTagName): ?string {
+    $pieces = explode('.', substr($componentTagName, 2));
+    $className = $this->dashToUpperCamelCase(array_pop($pieces));
+    $namespace = $this->namespacesMap['default'] ?? '';
 
-            foreach ($matches as $match) {
-                $index = $this->dashToCamelCase($match[3]);
-                $value = 'true';
-                $isString = empty($match[2]);
+    if (!empty($pieces)) {
+      do {
+        $currentIndex = implode('.', $pieces);
 
-                if (!empty($match[6])) {
-                    $value = $match[6];
-
-                    if ($isString) {
-                        $value = "'$value'";
-                    }
-                }
-
-                $code .= "'$index' => $value,";
-            }
+        if (isset($this->namespacesMap[$currentIndex])) {
+          $namespace = $this->namespacesMap[$currentIndex];
+          break;
         }
 
-        $code .= ']';
-
-        return $code;
+        $className = $this->dashToUpperCamelCase(array_pop($pieces)) . '\\' . $className;
+      } while (!empty($pieces));
     }
 
-    /**
-     * @param string $componentTagName
-     *
-     * @return string|null
-     */
-    private function getComponentClass(string $componentTagName): ?string
-    {
-        $pieces = explode('.', substr($componentTagName, 2));
-        $className = $this->dashToUpperCamelCase(array_pop($pieces));
-        $namespace = $this->namespacesMap['default'];
-
-        if (!empty($pieces)) {
-            do {
-                $currentIndex = implode('.', $pieces);
-
-                if (isset($this->namespacesMap[$currentIndex])) {
-                    $namespace = $this->namespacesMap[$currentIndex];
-                    break;
-                }
-
-                $className = $this->dashToUpperCamelCase(array_pop($pieces)).'\\'.$className;
-            } while(!empty($pieces));
-        }
-
-        return !empty($namespace) ? "\\$namespace\\$className" : "\\$className";
-    }
+    return !empty($namespace) ? "\\{$namespace}\\{$className}" : "\\{$className}";
+  }
 }
diff --git a/src/Crow.php b/src/Crow.php
index 63703e2..db00e3c 100644
--- a/src/Crow.php
+++ b/src/Crow.php
@@ -6,379 +6,370 @@
 use Corviz\Crow\Methods;
 use Exception;
 
-class Crow
-{
-    /**
-     *
-     */
-    public const DEFAULT_EXTENSION = '.crow.php';
-
-    /**
-     *
-     */
-    private const DEFAULT_METHODS = [
-        'empty' => Methods\Empty\EmptyMethod::class,
-        'endempty' => Methods\Empty\EndEmptyMethod::class,
-        'for' => Methods\For\ForMethod::class,
-        'endfor' => Methods\For\EndForMethod::class,
-        'foreach' => Methods\Foreach\ForeachMethod::class,
-        'endforeach' => Methods\Foreach\EndForeachMethod::class,
-        'forelse' => Methods\Forelse\ForelseMethod::class,
-        'endforelse' => Methods\Forelse\EndforelseMethod::class,
-        'if' => Methods\If\IfMethod::class,
-        'else' => Methods\If\ElseMethod::class,
-        'elseif' => Methods\If\ElseIfMethod::class,
-        'endif' => Methods\If\EndIfMethod::class,
-        'isset' => Methods\Isset\IssetMethod::class,
-        'endisset' => Methods\Isset\EndIssetMethod::class,
-        'php' => Methods\Php\PhpMethod::class,
-        'endphp' => Methods\Php\EndPhpMethod::class,
-        'section' => Methods\Section\SectionMethod::class,
-        'endsection' => Methods\Section\EndSectionMethod::class,
-        'case' => Methods\Switch\CaseMethod::class,
-        'default' => Methods\Switch\DefaultMethod::class,
-        'endswitch' => Methods\Switch\EndSwitchMethod::class,
-        'switch' => Methods\Switch\SwitchMethod::class,
-        'unless' => Methods\Unless\UnlessMethod::class,
-        'endunless' => Methods\Unless\EndUnlessMethod::class,
-        'while' => Methods\While\WhileMethod::class,
-        'endwhile' => Methods\While\EndWhileMethod::class,
-        'break' => Methods\BreakMethod::class,
-        'checked' => Methods\CheckedMethod::class,
-        'class' => Methods\ClassMethod::class,
-        'continue' => Methods\ContinueMethod::class,
-        'disabled' => Methods\DisabledMethod::class,
-        'extends' => Methods\ExtendsMethod::class,
-        'include' => Methods\IncludeMethod::class,
-        'readonly' => Methods\ReadonlyMethod::class,
-        'selected' => Methods\SelectedMethod::class,
-        'yield' => Methods\YieldMethod::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static array $pathHashes = [];
-
-    /**
-     * @var Closure|null
-     */
-    private static ?Closure $pathHashingFunction = null;
-
-    /**
-     * @var string|null
-     */
-    private static ?string $cacheFolder = null;
-
-    /**
-     * @var array
-     */
-    private static array $data = [];
-
-    /**
-     * @var FileLoader
-     */
-    private static ?FileLoader $loader = null;
-
-    /**
-     * @var CodeConverter
-     */
-    private static ?CodeConverter $codeConverter = null;
-
-    /**
-     * @var ComponentConverter|null
-     */
-    private static ?ComponentConverter $componentConverter = null;
-
-    /**
-     * @var array
-     */
-    private static array $renderQueue = [];
-
-    /**
-     * @param string $file
-     * @param array $data
-     * @param string|null $path
-     *
-     * @throws Exception
-     * @return void
-     */
-    public static function render(string $file, array $data = [], ?string $path = null)
-    {
-        $cacheFile = null;
-        self::data('dataKeys', array_keys($data));
-        $isCached = false;
-
-        if (!is_null(self::$cacheFolder)) {
-            $folder = 'c'.self::generatePathHash($path);
-            $cacheFile = self::$cacheFolder."/$folder/$file.cache.php";
-
-            $loader = self::getLoader();
-            if (is_file($cacheFile) && filemtime($cacheFile) > $loader->getModificationTime($file, $path)) {
-                $isCached = true;
-            }
-        }
-
-        if (!$isCached) {
-            $__crowTemplateCode = self::getPhpCode($file, $path);
-            self::getComponentConverter()->toPhp($__crowTemplateCode);
-
-            if (!is_null(self::$cacheFolder)) {
-                $cacheDir = dirname($cacheFile);
-                if (!is_dir($cacheDir)) {
-                    mkdir($cacheDir, recursive: true);
-                }
-
-                if (false === file_put_contents($cacheFile, $__crowTemplateCode)) {
-                    throw new Exception('Could not write cache file: '.$cacheFile);
-                }
-            }
-
-            extract($data);
-            eval("?>$__crowTemplateCode<?php");
-        } else {
-            extract($data);
-            require $cacheFile;
-        }
-    }
-
-    /**
-     * @param string $namespace
-     * @param string|null $prefix
-     * @return void
-     * @throws Exception
-     */
-    public static function addComponentsNamespace(string $namespace, string $prefix = null): void
-    {
-        $arguments = [$namespace];
-
-        if (!is_null($prefix)) {
-            $arguments[] = $prefix;
-        }
-
-        self::getComponentConverter()->addComponentsNamespace(...$arguments);
-    }
-
-    /**
-     * @param string $method
-     * @param string $class
-     *
-     * @return void
-     */
-    public static function addMethod(string $method, string $class): void
-    {
-        self::getCodeConverter()->addMethod($method, $class);
-    }
-
-    /**
-     * @param string|null $key
-     * @param mixed|null $value
-     *
-     * @return mixed
-     */
-    public static function data(string $key = null, mixed $value = null): mixed
-    {
-        if (is_null($key) && is_null($value))
-            return self::$data;
-
-        if (is_null($value))
-            return self::$data[$key] ?? null;
-
-        self::$data[$key] = $value;
-        return null;
-    }
-
-    /**
-     * @return void
-     */
-    public static function disableCodeMinifying(): void
-    {
-        self::data('options.disable-minifying', true);
-    }
-
-    /**
-     * @param string $key
-     *
-     * @return void
-     */
-    public static function removeData(string $key): void
-    {
-        if (isset(self::$data[$key]))
-            unset(self::$data[$key]);
+class Crow {
+  /**
+   * @const DEFAULT_EXTENSION
+   */
+  public const DEFAULT_EXTENSION = '.crow.php';
+
+  /**
+   * @const DEFAULT_METHODS
+   */
+  private const DEFAULT_METHODS = [
+    'empty' => Methods\EmptyUtil\EmptyMethod::class,              // // (Empty) itself causes error, so decided to suffix it.
+    'endempty' => Methods\EmptyUtil\EndEmptyMethod::class,        // // (Empty) itself causes error, so decided to suffix it.
+    'for' => Methods\For\ForMethod::class,
+    'endfor' => Methods\For\EndForMethod::class,
+    'foreach' => Methods\ForeachUtil\ForeachMethod::class,        // // (Foreach) itself causes error, so decided to suffix it.
+    'endforeach' => Methods\ForeachUtil\EndForeachMethod::class,  // // (Foreach) itself causes error, so decided to suffix it.
+    'forelse' => Methods\Forelse\ForelseMethod::class,
+    'endforelse' => Methods\Forelse\EndforelseMethod::class,
+    'if' => Methods\If\IfMethod::class,
+    'else' => Methods\If\ElseMethod::class,
+    'elseif' => Methods\If\ElseIfMethod::class,
+    'endif' => Methods\If\EndIfMethod::class,
+    'isset' => Methods\IssetUtil\IssetMethod::class,              // // (Isset) itself causes error, so decided to suffix it.
+    'endisset' => Methods\IssetUtil\EndIssetMethod::class,        // // (Isset) itself causes error, so decided to suffix it.
+    'notisset' => Methods\NotIsset\NotIssetMethod::class,
+    'endnotisset' => Methods\NotIsset\EndNotIssetMethod::class,
+    'php' => Methods\Php\PhpMethod::class,
+    'endphp' => Methods\Php\EndPhpMethod::class,
+    'section' => Methods\Section\SectionMethod::class,
+    'endsection' => Methods\Section\EndSectionMethod::class,
+    'case' => Methods\Switch\CaseMethod::class,
+    'default' => Methods\Switch\DefaultMethod::class,
+    'endswitch' => Methods\Switch\EndSwitchMethod::class,
+    'switch' => Methods\Switch\SwitchMethod::class,
+    'unless' => Methods\Unless\UnlessMethod::class,
+    'endunless' => Methods\Unless\EndUnlessMethod::class,
+    'while' => Methods\While\WhileMethod::class,
+    'endwhile' => Methods\While\EndWhileMethod::class,
+    'break' => Methods\BreakMethod::class,
+    'checked' => Methods\CheckedMethod::class,
+    'class' => Methods\ClassMethod::class,
+    'continue' => Methods\ContinueMethod::class,
+    'disabled' => Methods\DisabledMethod::class,
+    'extends' => Methods\ExtendsMethod::class,
+    'include' => Methods\IncludeMethod::class,
+    'readonly' => Methods\ReadonlyMethod::class,
+    'selected' => Methods\SelectedMethod::class,
+    'yield' => Methods\YieldMethod::class,
+  ];
+
+  /**
+   * @var array
+   */
+  private static array $pathHashes = [];
+
+  /**
+   * @var Closure|null
+   */
+  private static ?Closure $pathHashingFunction = null;
+
+  /**
+   * @var string|null
+   */
+  private static ?string $cacheFolder = null;
+
+  /**
+   * @var array
+   */
+  private static array $data = [];
+
+  /**
+   * @var FileLoader
+   */
+  private static ?FileLoader $loader = null;
+
+  /**
+   * @var CodeConverter
+   */
+  private static ?CodeConverter $codeConverter = null;
+
+  /**
+   * @var ComponentConverter|null
+   */
+  private static ?ComponentConverter $componentConverter = null;
+
+  /**
+   * @var array
+   */
+  private static array $renderQueue = [];
+
+  /**
+   * Globalize main object instance
+   * @var object
+   */
+  public static $global = [];
+
+  /**
+   * Globalize array of variables
+   * @var array
+   */
+  public static $viewbag = [];
+
+  public static function setViewbag(array $viewbag): void {
+    self::$viewbag = [... self::$viewbag, ...$viewbag];
+  }
+
+  /**
+   * @param string $file
+   * @param array $data
+   * @param string|null $path
+   *
+   * @throws Exception
+   * @return void
+   */
+  public static function render(string $file, array $data = [], ?string $path = null) {
+    $cacheFile = null;
+    self::data('dataKeys', array_keys($data));
+    $isCached = false;
+
+    if (!is_null(self::$cacheFolder)) {
+      $folder = 'c' . self::generatePathHash($path);
+      $cacheFile = self::$cacheFolder . "/$folder/$file.cache.php";
+
+      $loader = self::getLoader();
+      if (is_file($cacheFile) && filemtime($cacheFile) > $loader->getModificationTime($file, $path)) {
+        $isCached = true;
+      }
     }
 
-    /**
-     * @return string|null
-     */
-    public static function getExtension(): string
-    {
-        return self::getLoader()->getExtension() ?? self::DEFAULT_EXTENSION;
-    }
+    if (!$isCached) {
+      $__crowTemplateCode = self::getPhpCode($file, $path);
+      self::getComponentConverter()->toPhp($__crowTemplateCode);
 
-    /**
-     * @param string $file
-     * @param string|null $path
-     *
-     * @return string
-     * @throws Exception
-     */
-    public static function getPhpCode(string $file, ?string $path = null): string
-    {
-        $code = self::getCodeConverter()->toPhp(
-            self::getTemplateContents($file, $path)
-        );
-
-        while (!empty(self::$renderQueue)) {
-            $tpl = array_pop(self::$renderQueue);
-
-            $code .= self::getCodeConverter()->toPhp(
-                self::getTemplateContents($tpl['file'], $tpl['path'])
-            );
+      if (!is_null(self::$cacheFolder)) {
+        $cacheDir = dirname($cacheFile);
+        if (!is_dir($cacheDir)) {
+          mkdir($cacheDir, recursive: true);
         }
 
-        self::minify($code);
+        if (false === file_put_contents($cacheFile, $__crowTemplateCode)) {
+          throw new Exception('Could not write cache file: ' . $cacheFile);
+        }
+      }
 
-        return $code;
+      extract($data);
+      extract(self::$viewbag);
+      eval ("?>$__crowTemplateCode<?php");
     }
-
-    /**
-     * @param string $file
-     * @param string|null $path
-     *
-     * @return string
-     * @throws Exception
-     */
-    public static function getTemplateContents(string $file, ?string $path = null): string
-    {
-        return self::getLoader()->load($file, $path);
+    else {
+      extract($data);
+      extract(self::$viewbag);
+      require $cacheFile;
     }
-
-    /**
-     * @param string|null $cacheFolder
-     */
-    public static function setCacheFolder(?string $cacheFolder): void
-    {
-        self::$cacheFolder = $cacheFolder;
+  }
+
+  /**
+   * @param string $namespace
+   * @param string|null $prefix
+   * @return void
+   * @throws Exception
+   */
+  public static function addComponentsNamespace(string $namespace, string|null $prefix = null): void {
+    $arguments = [$namespace];
+
+    if (!is_null($prefix)) {
+      $arguments[] = $prefix;
     }
 
-    /**
-     * @param string $namespace
-     * @return void
-     * @throws Exception
-     */
-    public static function setComponentsNamespace(string $namespace)
-    {
-        self::addComponentsNamespace($namespace);
+    self::getComponentConverter()->addComponentsNamespace(...$arguments);
+  }
+
+  /**
+   * @param string $method
+   * @param string $class
+   *
+   * @return void
+   */
+  public static function addMethod(string $method, string $class): void {
+    self::getCodeConverter()->addMethod($method, $class);
+  }
+
+  /**
+   * @param string|null $key
+   * @param mixed|null $value
+   *
+   * @return mixed
+   */
+  public static function data(string|null $key = null, mixed $value = null): mixed {
+    if (is_null($key) && is_null($value)) return self::$data;
+    if (is_null($value)) return self::$data[$key] ?? null;
+
+    self::$data[$key] = $value;
+    return null;
+  }
+
+  /**
+   * @return void
+   */
+  public static function disableCodeMinifying(): void {
+    self::data('options.disable-minifying', true);
+  }
+
+  /**
+   * @param string $key
+   *
+   * @return void
+   */
+  public static function removeData(string $key): void {
+    if (isset(self::$data[$key])) unset(self::$data[$key]);
+  }
+
+  /**
+   * @return string|null
+   */
+  public static function getExtension(): string {
+    return self::getLoader()->getExtension() ?? self::DEFAULT_EXTENSION;
+  }
+
+  /**
+   * @param string $file
+   * @param string|null $path
+   *
+   * @return string
+   * @throws Exception
+   */
+  public static function getPhpCode(string $file, ?string $path = null): string {
+    $code = self::getCodeConverter()->toPhp(
+      self::getTemplateContents($file, $path)
+    );
+
+    while (!empty(self::$renderQueue)) {
+      $tpl = array_pop(self::$renderQueue);
+      $code .= self::getCodeConverter()->toPhp(self::getTemplateContents($tpl['file'], $tpl['path']));
     }
 
-    /**
-     * @param string $path
-     * @return void
-     */
-    public static function setDefaultPath(string $path)
-    {
-        self::getLoader()->setDefaultPath($path);
+    self::minify($code);
+
+    return $code;
+  }
+
+  /**
+   * @param string $file
+   * @param string|null $path
+   *
+   * @return string
+   * @throws Exception
+   */
+  public static function getTemplateContents(string $file, ?string $path = null): string {
+    return self::getLoader()->load($file, $path);
+  }
+
+  /**
+   * @param string|null $cacheFolder
+   */
+  public static function setCacheFolder(?string $cacheFolder): void {
+    self::$cacheFolder = $cacheFolder;
+  }
+
+  /**
+   * @param string $namespace
+   * @return void
+   * @throws Exception
+   */
+  public static function setComponentsNamespace(string $namespace) {
+    self::addComponentsNamespace($namespace);
+  }
+
+  /**
+   * @param string $path
+   * @return void
+   */
+  public static function setDefaultPath(string $path) {
+    self::getLoader()->setDefaultPath($path);
+  }
+
+  /**
+   * @param string $extension
+   * @return void
+   */
+  public static function setExtension(string $extension) {
+    self::getLoader()->setExtension($extension);
+  }
+
+  /**
+   * @param callable $pathHashingFunction
+   *
+   * @return void
+   */
+  public static function setPathHashingFunction(callable $pathHashingFunction): void {
+    self::$pathHashingFunction = Closure::fromCallable($pathHashingFunction);
+  }
+
+  /**
+   * @param string $file
+   * @param string|null $path
+   *
+   * @return void
+   */
+  public static function queueTemplate(string $file, ?string $path = null) {
+    self::$renderQueue[] = compact('file', 'path');
+  }
+
+  /**
+   * @param string|null $path
+   * @return string
+   */
+  private static function generatePathHash(?string $path): string {
+    $path ??= 'default';
+
+    if (!isset(self::$pathHashes[$path])) {
+      $hashingFunction = self::$pathHashingFunction ?? 'md5';
+      self::$pathHashes[$path] = $hashingFunction($path);
     }
 
-    /**
-     * @param string $extension
-     * @return void
-     */
-    public static function setExtension(string $extension)
-    {
-        self::getLoader()->setExtension($extension);
-    }
+    return self::$pathHashes[$path];
+  }
 
-    /**
-     * @param callable $pathHashingFunction
-     *
-     * @return void
-     */
-    public static function setPathHashingFunction(callable $pathHashingFunction): void
-    {
-        self::$pathHashingFunction = Closure::fromCallable($pathHashingFunction);
-    }
+  /**
+   * @return CodeConverter
+   */
+  private static function getCodeConverter(): CodeConverter {
+    if (!self::$codeConverter) {
+      self::$codeConverter = new CodeConverter();
 
-    /**
-     * @param string $file
-     * @param string|null $path
-     *
-     * @return void
-     */
-    public static function queueTemplate(string $file, ?string $path = null)
-    {
-        self::$renderQueue[] = compact('file', 'path');
+      // Register all default methods
+      foreach (self::DEFAULT_METHODS as $m => $c) {
+        self::$codeConverter->addMethod($m, $c);
+      }
     }
 
-    /**
-     * @param string|null $path
-     * @return string
-     */
-    private static function generatePathHash(?string $path): string
-    {
-        $path = $path ?? 'default';
-
-        if (!isset(self::$pathHashes[$path])) {
-            $hashingFunction = self::$pathHashingFunction ?? 'md5';
-            self::$pathHashes[$path] = $hashingFunction($path);
-        }
+    return self::$codeConverter;
+  }
 
-        return self::$pathHashes[$path];
+  /**
+   * @return ComponentConverter
+   */
+  private static function getComponentConverter(): ComponentConverter {
+    if (!self::$componentConverter) {
+      self::$componentConverter = new ComponentConverter();
     }
 
-    /**
-     * @return CodeConverter
-     */
-    private static function getCodeConverter(): CodeConverter
-    {
-        if (!self::$codeConverter){
-            self::$codeConverter = new CodeConverter();
-
-            //Register all default methods
-            foreach (self::DEFAULT_METHODS as $m => $c) {
-                self::$codeConverter->addMethod($m, $c);
-            }
-        }
+    return self::$componentConverter;
+  }
 
-        return self::$codeConverter;
+  /**
+   * @return FileLoader
+   */
+  private static function getLoader(): FileLoader {
+    if (!self::$loader) {
+      self::$loader = FileLoader::create()->setExtension(self::DEFAULT_EXTENSION);
     }
 
-    /**
-     * @return ComponentConverter
-     */
-    private static function getComponentConverter(): ComponentConverter
-    {
-        if (!self::$componentConverter){
-            self::$componentConverter = new ComponentConverter();
-        }
-
-        return self::$componentConverter;
-    }
+    return self::$loader;
+  }
 
-    /**
-     * @return FileLoader
-     */
-    private static function getLoader(): FileLoader
-    {
-        if (!self::$loader) {
-            self::$loader = FileLoader::create()
-                ->setExtension(self::DEFAULT_EXTENSION);
-        }
+  /**
+   * @param string $code
+   * @return string
+   */
+  private static function minify(string &$code): void {
+    if (self::data('options.disable-minifying')) return;
 
-        return self::$loader;
-    }
-
-    /**
-     * @param string $code
-     * @return string
-     */
-    private static function minify(string &$code): void
-    {
-        if (self::data('options.disable-minifying'))
-            return;
-
-        $code = str_replace(["\t", "\n", "\r"], ' ', $code);
-        $code = preg_replace('/\s{2,}/m', ' ', $code);
-        $code = trim($code);
-    }
+    $code = str_replace(["\t", "\n", "\r"], ' ', $code);
+    $code = preg_replace('/\s{2,}/m', ' ', $code);
+    $code = trim($code);
+  }
 }
diff --git a/src/FileLoader.php b/src/FileLoader.php
index b57381e..705840f 100644
--- a/src/FileLoader.php
+++ b/src/FileLoader.php
@@ -5,87 +5,84 @@
 use Corviz\Crow\Traits\SelfCreate;
 use Exception;
 
-class FileLoader
-{
-    use SelfCreate;
+class FileLoader {
+  use SelfCreate;
 
-    /**
-     * @var string|null
-     */
-    private ?string $defaultPath = null;
+  /**
+   * @var string|null
+   */
+  private ?string $defaultPath = null;
 
-    /**
-     * @var string|null
-     */
-    private ?string $extension = null;
+  /**
+   * @var string|null
+   */
+  private ?string $extension = null;
 
-    /**
-     * @return string|null
-     */
-    public function getExtension(): ?string
-    {
-        return $this->extension;
-    }
-
-    /**
-     * @param string $file
-     * @param string|null $path
-     * @return int|false
-     */
-    public function getModificationTime(string $file, string $path = null): int|false
-    {
-        return filemtime($this->getFilePath($file, $path));
-    }
+  /**
+   * @return string|null
+   */
+  public function getExtension(): ?string {
+    return $this->extension;
+  }
 
-    /**
-     *
-     * @param string $file
-     * @param string|null $path
-     *
-     * @return string
-     * @throws Exception
-     */
-    public function load(string $file, string $path = null): string
-    {
-        $filename = $this->getFilePath($file, $path);
+  /**
+   * @param string $file
+   * @param string|null $path
+   * @return int|false
+   */
+  public function getModificationTime(string $file, string|null $path = null): int|false {
+    return filemtime($this->getFilePath($file, $path));
+  }
 
-        if (!is_file($filename) || !is_readable($filename)) {
-            throw new Exception("File is unreadable: '$filename'");
-        }
+  /**
+   *
+   * @param string $file
+   * @param string|null $path
+   *
+   * @return string
+   * @throws Exception
+   */
+  public function load(string $file, string|null $path = null): string {
+    $filename = $this->getFilePath($file, $path);
 
-        return file_get_contents($filename);
+    if (!is_file($filename) || !is_readable($filename)) {
+      throw new Exception("File is unreadable: '$filename'");
     }
 
-    /**
-     * @param string|null $defaultPath
-     * @return FileLoader
-     */
-    public function setDefaultPath(?string $defaultPath): FileLoader
-    {
-        $this->defaultPath = $defaultPath;
-        return $this;
-    }
+    return file_get_contents($filename);
+  }
 
-    /**
-     * @param string|null $extension
-     * @return FileLoader
-     */
-    public function setExtension(?string $extension): FileLoader
-    {
-        $this->extension = $extension;
-        return $this;
-    }
+  /**
+   * @param string|null $defaultPath
+   * @return FileLoader
+   */
+  public function setDefaultPath(?string $defaultPath): FileLoader {
+    $this->defaultPath = $defaultPath;
+    return $this;
+  }
 
-    /**
-     * @param string $file
-     * @param string|null $path
-     * @return string
-     */
-    private function getFilePath(string $file, string $path = null)
-    {
-        $path = $path ?? $this->defaultPath ?? '';
-        $extension = $this->extension ?? '';
+  /**
+   * @param string|null $extension
+   * @return FileLoader
+   */
+  public function setExtension(?string $extension): FileLoader {
+    $this->extension = $extension;
+    return $this;
+  }
 
-        return "$path/{$file}{$extension}";
-    }
+  /**
+   * @param string $file
+   * @param string|null $path
+   * @return string
+   */
+  private function getFilePath(string $file, string|null $path = null) {
+    $path ??= $this->defaultPath ?? '';
+    $extension = $this->extension ?? '';
+    $extension = str_starts_with($extension, '.') ? substr($extension, 1) : $extension;
+    $extension = str_ends_with($extension, 'php') ? rtrim($extension, '.php') : $extension;
+    $extension = str_ends_with($extension, '.') ? rtrim($extension, '.') : $extension;
+    $extension = $extension != '' ? ".{$extension}" : $extension;
+
+    return "{$path}/{$file}{$extension}.php";
+  }
 }
diff --git a/src/Method.php b/src/Method.php
index 90c2d31..8aa35cf 100644
--- a/src/Method.php
+++ b/src/Method.php
@@ -4,15 +4,14 @@
 
 use Corviz\Crow\Traits\SelfCreate;
 
-abstract class Method
-{
-    use SelfCreate;
+abstract class Method {
+  use SelfCreate;
 
-    /**
-     * Php code representing this method
-     *
-     * @param string|null $parameters
-     * @return string
-     */
-    abstract public function toPhpCode(?string $parameters = null): string;
+  /**
+   * Php code representing this method
+   *
+   * @param string|null $parameters
+   * @return string
+   */
+  abstract public function toPhpCode(?string $parameters = null): string;
 }
diff --git a/src/Methods/BreakMethod.php b/src/Methods/BreakMethod.php
index e0fa777..202e3eb 100644
--- a/src/Methods/BreakMethod.php
+++ b/src/Methods/BreakMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class BreakMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return '<?php '.($parameters ? "if ($parameters)" : '').' break; ?>';
-    }
+class BreakMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return '<?php ' . ($parameters ? "if ({$parameters})" : '') . ' break; ?>';
+  }
 }
diff --git a/src/Methods/CheckedMethod.php b/src/Methods/CheckedMethod.php
index 2198a09..520f9a5 100644
--- a/src/Methods/CheckedMethod.php
+++ b/src/Methods/CheckedMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class CheckedMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php echo ($parameters) ? 'checked' : '' ?>";
-    }
+class CheckedMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php echo ({$parameters}) ? 'checked' : '' ?>";
+  }
 }
diff --git a/src/Methods/ClassMethod.php b/src/Methods/ClassMethod.php
index 92ac139..fca67bd 100644
--- a/src/Methods/ClassMethod.php
+++ b/src/Methods/ClassMethod.php
@@ -2,18 +2,17 @@
 
 namespace Corviz\Crow\Methods;
 
-class ClassMethod extends \Corviz\Crow\Method
-{
+class ClassMethod extends \Corviz\Crow\Method {
 
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        $code = 'class="<?php ';
-        $code .= "foreach($parameters as \$__cclassname => \$__ccheck) {";
-        $code .= 'if ($__ccheck) echo $__cclassname, \' \'; ';
-        $code .= '} ?>"';
-        return $code;
-    }
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    $code = 'class="<?php ';
+    $code .= "foreach ({$parameters} as \$__cclassname => \$__ccheck) {";
+    $code .= 'if (is_bool($__ccheck) and $__ccheck) { echo $__cclassname, \' \'; } ';
+    $code .= 'else if (is_numeric($__cclassname)) { echo $__ccheck, \' \'; } ';
+    $code .= '} ?>"';
+    return $code;
+  }
 }
\ No newline at end of file
diff --git a/src/Methods/ContinueMethod.php b/src/Methods/ContinueMethod.php
index cd456b8..95a90e1 100644
--- a/src/Methods/ContinueMethod.php
+++ b/src/Methods/ContinueMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class ContinueMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return '<?php '.($parameters ? "if ($parameters)" : '').' continue; ?>';
-    }
+class ContinueMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php " . ($parameters ? "if ({$parameters})" : "") . " continue; ?>";
+  }
 }
diff --git a/src/Methods/DisabledMethod.php b/src/Methods/DisabledMethod.php
index 4f1a5b1..d00faf6 100644
--- a/src/Methods/DisabledMethod.php
+++ b/src/Methods/DisabledMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class DisabledMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php echo ($parameters) ? 'disabled' : '' ?>";
-    }
+class DisabledMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php echo ({$parameters}) ? 'disabled' : '' ?>";
+  }
 }
diff --git a/src/Methods/Empty/EmptyMethod.php b/src/Methods/Empty/EmptyMethod.php
deleted file mode 100644
index de95283..0000000
--- a/src/Methods/Empty/EmptyMethod.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Corviz\Crow\Methods\Empty;
-
-use Corviz\Crow\Crow;
-use Corviz\Crow\Method;
-
-class EmptyMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        $code = "<?php if (empty($parameters)) { ?>";
-
-        if (Crow::data('forelse')) {
-            $code = "<?php }} else { ?>";
-            Crow::removeData('forelse');
-        }
-
-        return $code;
-    }
-}
diff --git a/src/Methods/Empty/EndEmptyMethod.php b/src/Methods/Empty/EndEmptyMethod.php
deleted file mode 100644
index 856fa6b..0000000
--- a/src/Methods/Empty/EndEmptyMethod.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Corviz\Crow\Methods\Empty;
-
-use Corviz\Crow\Method;
-
-class EndEmptyMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } ?>";
-    }
-}
diff --git a/src/Methods/EmptyUtil/EmptyMethod.php b/src/Methods/EmptyUtil/EmptyMethod.php
new file mode 100644
index 0000000..0f84a6a
--- /dev/null
+++ b/src/Methods/EmptyUtil/EmptyMethod.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Corviz\Crow\Methods\EmptyUtil;
+
+use Corviz\Crow\Crow;
+use Corviz\Crow\Method;
+
+class EmptyMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    $code = "<?php if (empty($parameters)) { ?>";
+
+    if (Crow::data('forelse')) {
+      $code = "<?php }} else { ?>";
+      Crow::removeData('forelse');
+    }
+
+    return $code;
+  }
+}
diff --git a/src/Methods/EmptyUtil/EndEmptyMethod.php b/src/Methods/EmptyUtil/EndEmptyMethod.php
new file mode 100644
index 0000000..039b81e
--- /dev/null
+++ b/src/Methods/EmptyUtil/EndEmptyMethod.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Corviz\Crow\Methods\EmptyUtil;
+
+use Corviz\Crow\Method;
+
+class EndEmptyMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
+}
diff --git a/src/Methods/ExtendsMethod.php b/src/Methods/ExtendsMethod.php
index 5409a9d..431d98e 100644
--- a/src/Methods/ExtendsMethod.php
+++ b/src/Methods/ExtendsMethod.php
@@ -5,15 +5,13 @@
 use Corviz\Crow\Crow;
 use Corviz\Crow\Method;
 
-class ExtendsMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        eval('$parameters = '.$parameters.';');
-        Crow::queueTemplate($parameters);
-        return '';
-    }
+class ExtendsMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    eval ("\$parameters = {$parameters};");
+    Crow::queueTemplate($parameters);
+    return '';
+  }
 }
diff --git a/src/Methods/For/EndForMethod.php b/src/Methods/For/EndForMethod.php
index a31928a..a3bab9e 100644
--- a/src/Methods/For/EndForMethod.php
+++ b/src/Methods/For/EndForMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class EndForMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } ?>";
-    }
+class EndForMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
 }
diff --git a/src/Methods/For/ForMethod.php b/src/Methods/For/ForMethod.php
index bdbb672..7a5c982 100644
--- a/src/Methods/For/ForMethod.php
+++ b/src/Methods/For/ForMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class ForMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php for($parameters) { ?>";
-    }
+class ForMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php for({$parameters}) { ?>";
+  }
 }
diff --git a/src/Methods/Foreach/EndForeachMethod.php b/src/Methods/Foreach/EndForeachMethod.php
deleted file mode 100644
index 30e31f6..0000000
--- a/src/Methods/Foreach/EndForeachMethod.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Corviz\Crow\Methods\Foreach;
-
-use Corviz\Crow\Method;
-
-class EndForeachMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } ?>";
-    }
-}
diff --git a/src/Methods/Foreach/ForeachMethod.php b/src/Methods/Foreach/ForeachMethod.php
deleted file mode 100644
index 651c6b8..0000000
--- a/src/Methods/Foreach/ForeachMethod.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Corviz\Crow\Methods\Foreach;
-
-use Corviz\Crow\Method;
-
-class ForeachMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php foreach($parameters) { ?>";
-    }
-}
diff --git a/src/Methods/ForeachUtil/EndForeachMethod.php b/src/Methods/ForeachUtil/EndForeachMethod.php
new file mode 100644
index 0000000..58e73c7
--- /dev/null
+++ b/src/Methods/ForeachUtil/EndForeachMethod.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Corviz\Crow\Methods\ForeachUtil;
+
+use Corviz\Crow\Method;
+
+class EndForeachMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
+}
diff --git a/src/Methods/ForeachUtil/ForeachMethod.php b/src/Methods/ForeachUtil/ForeachMethod.php
new file mode 100644
index 0000000..106c8e2
--- /dev/null
+++ b/src/Methods/ForeachUtil/ForeachMethod.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Corviz\Crow\Methods\ForeachUtil;
+
+use Corviz\Crow\Method;
+
+class ForeachMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php foreach({$parameters}) { ?>";
+  }
+}
diff --git a/src/Methods/Forelse/EndforelseMethod.php b/src/Methods/Forelse/EndforelseMethod.php
index 5311b37..e12a518 100644
--- a/src/Methods/Forelse/EndforelseMethod.php
+++ b/src/Methods/Forelse/EndforelseMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class EndforelseMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } ?>";
-    }
+class EndforelseMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
 }
diff --git a/src/Methods/Forelse/ForelseMethod.php b/src/Methods/Forelse/ForelseMethod.php
index 631ccb6..4bb4051 100644
--- a/src/Methods/Forelse/ForelseMethod.php
+++ b/src/Methods/Forelse/ForelseMethod.php
@@ -5,23 +5,19 @@
 use Corviz\Crow\Crow;
 use Corviz\Crow\Method;
 
-class ForelseMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        $matches = [];
-        preg_match('/\$\w+/m', $parameters ?? '', $matches);
-        $v = $matches[0];
+class ForelseMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    $v = explode(' as ', $parameters)[0];
 
-        $code = "<?php ";
-        $code .= "if (!empty($v)) { ";
-        $code .= "foreach($parameters) { ?>";
+    $code = "<?php ";
+    $code .= "if (!empty($v)) { ";
+    $code .= "foreach($parameters) { ?>";
 
-        Crow::data('forelse', true);
+    Crow::data('forelse', true);
 
-        return $code;
-    }
+    return $code;
+  }
 }
diff --git a/src/Methods/If/ElseIfMethod.php b/src/Methods/If/ElseIfMethod.php
index 83c835d..ced6ed3 100644
--- a/src/Methods/If/ElseIfMethod.php
+++ b/src/Methods/If/ElseIfMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class ElseIfMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } elseif ($parameters) { ?>";
-    }
+class ElseIfMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } else if ({$parameters}) { ?>";
+  }
 }
diff --git a/src/Methods/If/ElseMethod.php b/src/Methods/If/ElseMethod.php
index 3542407..9dd6eb0 100644
--- a/src/Methods/If/ElseMethod.php
+++ b/src/Methods/If/ElseMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class ElseMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } else { ?>";
-    }
+class ElseMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } else { ?>";
+  }
 }
diff --git a/src/Methods/If/EndIfMethod.php b/src/Methods/If/EndIfMethod.php
index 6ee1ea6..74b5474 100644
--- a/src/Methods/If/EndIfMethod.php
+++ b/src/Methods/If/EndIfMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class EndIfMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } ?>";
-    }
+class EndIfMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
 }
diff --git a/src/Methods/If/IfMethod.php b/src/Methods/If/IfMethod.php
index d83a6f4..40f6fc3 100644
--- a/src/Methods/If/IfMethod.php
+++ b/src/Methods/If/IfMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class IfMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php if ($parameters) { ?>";
-    }
+class IfMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php if ({$parameters}) { ?>";
+  }
 }
diff --git a/src/Methods/IncludeMethod.php b/src/Methods/IncludeMethod.php
index 351c705..2b48ea5 100644
--- a/src/Methods/IncludeMethod.php
+++ b/src/Methods/IncludeMethod.php
@@ -5,14 +5,12 @@
 use Corviz\Crow\Crow;
 use Corviz\Crow\Method;
 
-class IncludeMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        eval("\$code = \Corviz\Crow\Crow::getTemplateContents($parameters);");
-        return $code;
-    }
+class IncludeMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    eval ("\$code = \Corviz\Crow\Crow::getTemplateContents({$parameters});");
+    return $code;
+  }
 }
diff --git a/src/Methods/Isset/EndIssetMethod.php b/src/Methods/Isset/EndIssetMethod.php
deleted file mode 100644
index 12cd377..0000000
--- a/src/Methods/Isset/EndIssetMethod.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Corviz\Crow\Methods\Isset;
-
-use Corviz\Crow\Method;
-
-class EndIssetMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } ?>";
-    }
-}
diff --git a/src/Methods/Isset/IssetMethod.php b/src/Methods/Isset/IssetMethod.php
deleted file mode 100644
index 5859606..0000000
--- a/src/Methods/Isset/IssetMethod.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Corviz\Crow\Methods\Isset;
-
-use Corviz\Crow\Method;
-
-class IssetMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php if (isset($parameters)) { ?>";
-    }
-}
\ No newline at end of file
diff --git a/src/Methods/IssetUtil/EndIssetMethod.php b/src/Methods/IssetUtil/EndIssetMethod.php
new file mode 100644
index 0000000..d8a9b27
--- /dev/null
+++ b/src/Methods/IssetUtil/EndIssetMethod.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Corviz\Crow\Methods\IssetUtil;
+
+use Corviz\Crow\Method;
+
+class EndIssetMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
+}
diff --git a/src/Methods/IssetUtil/IssetMethod.php b/src/Methods/IssetUtil/IssetMethod.php
new file mode 100644
index 0000000..84e444d
--- /dev/null
+++ b/src/Methods/IssetUtil/IssetMethod.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Corviz\Crow\Methods\IssetUtil;
+
+use Corviz\Crow\Method;
+
+class IssetMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php if (isset({$parameters})) { ?>";
+  }
+}
\ No newline at end of file
diff --git a/src/Methods/Notisset/EndNotissetMethod.php b/src/Methods/Notisset/EndNotissetMethod.php
new file mode 100644
index 0000000..a9dddda
--- /dev/null
+++ b/src/Methods/Notisset/EndNotissetMethod.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Corviz\Crow\Methods\NotIsset;
+
+use Corviz\Crow\Method;
+
+class EndNotIssetMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
+}
diff --git a/src/Methods/Notisset/NotissetMethod.php b/src/Methods/Notisset/NotissetMethod.php
new file mode 100644
index 0000000..6f3e3ed
--- /dev/null
+++ b/src/Methods/Notisset/NotissetMethod.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Corviz\Crow\Methods\NotIsset;
+
+use Corviz\Crow\Method;
+
+class NotIssetMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php if (!isset({$parameters})) { ?>";
+  }
+}
\ No newline at end of file
diff --git a/src/Methods/Php/EndPhpMethod.php b/src/Methods/Php/EndPhpMethod.php
index 92c2b49..1395e59 100644
--- a/src/Methods/Php/EndPhpMethod.php
+++ b/src/Methods/Php/EndPhpMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class EndPhpMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return " ?>";
-    }
+class EndPhpMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return " ?>";
+  }
 }
diff --git a/src/Methods/Php/PhpMethod.php b/src/Methods/Php/PhpMethod.php
index 9b0ae30..9ac3e50 100644
--- a/src/Methods/Php/PhpMethod.php
+++ b/src/Methods/Php/PhpMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class PhpMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php ";
-    }
+class PhpMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php ";
+  }
 }
diff --git a/src/Methods/ReadonlyMethod.php b/src/Methods/ReadonlyMethod.php
index f52d1b6..9efca53 100644
--- a/src/Methods/ReadonlyMethod.php
+++ b/src/Methods/ReadonlyMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class ReadonlyMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php echo ($parameters) ? 'readonly' : '' ?>";
-    }
+class ReadonlyMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php echo ({$parameters}) ? 'readonly' : '' ?>";
+  }
 }
diff --git a/src/Methods/Section/EndSectionMethod.php b/src/Methods/Section/EndSectionMethod.php
index 046a08a..f468877 100644
--- a/src/Methods/Section/EndSectionMethod.php
+++ b/src/Methods/Section/EndSectionMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class EndSectionMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return '<?php }); ?>';
-    }
+class EndSectionMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return '<?php }); ?>';
+  }
 }
diff --git a/src/Methods/Section/SectionMethod.php b/src/Methods/Section/SectionMethod.php
index 667f8d5..2298ca4 100644
--- a/src/Methods/Section/SectionMethod.php
+++ b/src/Methods/Section/SectionMethod.php
@@ -5,37 +5,34 @@
 use Corviz\Crow\Crow;
 use Corviz\Crow\Method;
 
-class SectionMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        eval("\$p = [$parameters];");
-        $use = $this->buildUse();
-        $code = "<?php \Corviz\Crow\SectionsManager::addSection('{$p[0]}', function() $use { ?>";
-
-        if (count($p) > 1) {
-            $code .= $p[1];
-            $code .= "<?php }); ?>";
-        }
-
-        return $code;
+class SectionMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    eval ("\$p = [$parameters];");
+    $use = $this->buildUse();
+    $code = "<?php \Corviz\Crow\SectionsManager::addSection('{$p[0]}', function() $use { ?>";
+
+    if (count($p) > 1) {
+      $code .= $p[1];
+      $code .= "<?php }); ?>";
     }
 
-    /**
-     * @return string
-     */
-    private function buildUse(): string
-    {
-        $use = '';
+    return $code;
+  }
 
-        $dataKeys = Crow::data('dataKeys') ?? [];
-        if (!empty($dataKeys)) {
-            $use = 'use ('.implode(',', array_map(fn($k) => "&$$k", $dataKeys)).')';
-        }
+  /**
+   * @return string
+   */
+  private function buildUse(): string {
+    $use = '';
+    $dataKeys = Crow::data('dataKeys') ?? [];
 
-        return $use;
+    if (!empty($dataKeys)) {
+      $use = 'use (' . implode(',', array_map(fn($k) => "&$$k", $dataKeys)) . ')';
     }
+
+    return $use;
+  }
 }
\ No newline at end of file
diff --git a/src/Methods/SelectedMethod.php b/src/Methods/SelectedMethod.php
index 8a25f6f..621407d 100644
--- a/src/Methods/SelectedMethod.php
+++ b/src/Methods/SelectedMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class SelectedMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php echo ($parameters) ? 'selected' : '' ?>";
-    }
+class SelectedMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php echo ({$parameters}) ? 'selected' : '' ?>";
+  }
 }
diff --git a/src/Methods/Switch/CaseMethod.php b/src/Methods/Switch/CaseMethod.php
index ea6e28a..52cb7c8 100644
--- a/src/Methods/Switch/CaseMethod.php
+++ b/src/Methods/Switch/CaseMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class CaseMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php case {$parameters}: ?>";
-    }
+class CaseMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php case ({$parameters}): ?>";
+  }
 }
diff --git a/src/Methods/Switch/DefaultMethod.php b/src/Methods/Switch/DefaultMethod.php
index 4e163ba..1bc6298 100644
--- a/src/Methods/Switch/DefaultMethod.php
+++ b/src/Methods/Switch/DefaultMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class DefaultMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php default: ?>";
-    }
+class DefaultMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php default: ?>";
+  }
 }
diff --git a/src/Methods/Switch/EndSwitchMethod.php b/src/Methods/Switch/EndSwitchMethod.php
index 697b064..712bed5 100644
--- a/src/Methods/Switch/EndSwitchMethod.php
+++ b/src/Methods/Switch/EndSwitchMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class EndSwitchMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } ?>";
-    }
+class EndSwitchMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
 }
diff --git a/src/Methods/Switch/SwitchMethod.php b/src/Methods/Switch/SwitchMethod.php
index 11b8845..b83b381 100644
--- a/src/Methods/Switch/SwitchMethod.php
+++ b/src/Methods/Switch/SwitchMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class SwitchMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php switch ($parameters) { ?>";
-    }
+class SwitchMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php switch ({$parameters}) { ?>";
+  }
 }
diff --git a/src/Methods/Unless/EndUnlessMethod.php b/src/Methods/Unless/EndUnlessMethod.php
index 770725b..9f9a527 100644
--- a/src/Methods/Unless/EndUnlessMethod.php
+++ b/src/Methods/Unless/EndUnlessMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class EndUnlessMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } ?>";
-    }
+class EndUnlessMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
 }
diff --git a/src/Methods/Unless/UnlessMethod.php b/src/Methods/Unless/UnlessMethod.php
index 95e3d39..8d62f07 100644
--- a/src/Methods/Unless/UnlessMethod.php
+++ b/src/Methods/Unless/UnlessMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class UnlessMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php if (!($parameters)) { ?>";
-    }
+class UnlessMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php if (!({$parameters})) { ?>";
+  }
 }
diff --git a/src/Methods/While/EndWhileMethod.php b/src/Methods/While/EndWhileMethod.php
index 936cdd4..68a403b 100644
--- a/src/Methods/While/EndWhileMethod.php
+++ b/src/Methods/While/EndWhileMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class EndWhileMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php } ?>";
-    }
+class EndWhileMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php } ?>";
+  }
 }
diff --git a/src/Methods/While/WhileMethod.php b/src/Methods/While/WhileMethod.php
index dc308fd..43c7f3a 100644
--- a/src/Methods/While/WhileMethod.php
+++ b/src/Methods/While/WhileMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class WhileMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php while ($parameters) { ?>";
-    }
+class WhileMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php while ({$parameters}) { ?>";
+  }
 }
diff --git a/src/Methods/YieldMethod.php b/src/Methods/YieldMethod.php
index 4b8f946..4676add 100644
--- a/src/Methods/YieldMethod.php
+++ b/src/Methods/YieldMethod.php
@@ -4,13 +4,11 @@
 
 use Corviz\Crow\Method;
 
-class YieldMethod extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public function toPhpCode(?string $parameters = null): string
-    {
-        return "<?php \Corviz\Crow\SectionsManager::renderSection($parameters); ?>";
-    }
+class YieldMethod extends Method {
+  /**
+   * @inheritDoc
+   */
+  public function toPhpCode(?string $parameters = null): string {
+    return "<?php \Corviz\Crow\SectionsManager::renderSection({$parameters}); ?>";
+  }
 }
diff --git a/src/SectionsManager.php b/src/SectionsManager.php
index dd72239..cc95c7b 100644
--- a/src/SectionsManager.php
+++ b/src/SectionsManager.php
@@ -2,32 +2,29 @@
 
 namespace Corviz\Crow;
 
-class SectionsManager
-{
-    /**
-     * @var array
-     */
-    private static array $sections = [];
+class SectionsManager {
+  /**
+   * @var array
+   */
+  private static array $sections = [];
 
-    /**
-     * @param string $index
-     * @param callable $section
-     *
-     * @return void
-     */
-    public static function addSection(string $index, callable $section): void
-    {
-        self::$sections[$index] = $section;
-    }
+  /**
+   * @param string $index
+   * @param callable $section
+   *
+   * @return void
+   */
+  public static function addSection(string $index, callable $section): void {
+    self::$sections[$index] = $section;
+  }
 
-    /**
-     * @param string $index
-     * @return void
-     */
-    public static function renderSection(string $index)
-    {
-        if (isset(self::$sections[$index])) {
-            self::$sections[$index]();
-        }
+  /**
+   * @param string $index
+   * @return void
+   */
+  public static function renderSection(string $index) {
+    if (isset(self::$sections[$index])) {
+      self::$sections[$index]();
     }
+  }
 }
diff --git a/src/Traits/SelfCreate.php b/src/Traits/SelfCreate.php
index a72a3c7..3ed69ab 100644
--- a/src/Traits/SelfCreate.php
+++ b/src/Traits/SelfCreate.php
@@ -2,15 +2,13 @@
 
 namespace Corviz\Crow\Traits;
 
-trait SelfCreate
-{
-    /**
-     * @see static::__construct();
-     *
-     * @return static
-     */
-    public static function create(...$arguments)
-    {
-        return new static(...$arguments);
-    }
+trait SelfCreate {
+  /**
+   * @see static::__construct();
+   *
+   * @return static
+   */
+  public static function create(...$arguments) {
+    return new static(...$arguments);
+  }
 }
\ No newline at end of file