diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..622f93fd
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*.php]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/src/Kris/LaravelFormBuilder/Fields/CollectionType.php b/src/Kris/LaravelFormBuilder/Fields/CollectionType.php
index 18f4527a..f72ece46 100644
--- a/src/Kris/LaravelFormBuilder/Fields/CollectionType.php
+++ b/src/Kris/LaravelFormBuilder/Fields/CollectionType.php
@@ -202,22 +202,22 @@ protected function formatInputIntoModels(array $input, array $originalData = [])
 
     protected function formatInputIntoModel($model, $input)
     {
-      if ($model instanceof Model) {
-        $model->forceFill($input);
-      }
-      elseif (is_object($model)) {
-        foreach ($input as $key => $value) {
-          $model->$key = $value;
+        if ($model instanceof Model) {
+            $model->forceFill($input);
         }
-      }
-      elseif (is_array($model)) {
-        $model = $input + $model;
-      }
-      else {
-        $model = $input;
-      }
-
-      return $model;
+        elseif (is_object($model)) {
+            foreach ($input as $key => $value) {
+                $model->$key = $value;
+            }
+        }
+        elseif (is_array($model)) {
+            $model = $input + $model;
+        }
+        else {
+            $model = $input;
+        }
+
+        return $model;
     }
 
     /**
diff --git a/src/Kris/LaravelFormBuilder/RulesParser.php b/src/Kris/LaravelFormBuilder/RulesParser.php
index f9de6898..e0bb9ce8 100644
--- a/src/Kris/LaravelFormBuilder/RulesParser.php
+++ b/src/Kris/LaravelFormBuilder/RulesParser.php
@@ -274,7 +274,7 @@ protected function min($param)
         }
 
         if ($this->isFile()) {
-        	return [];
+            return [];
         }
 
         return [
@@ -303,7 +303,7 @@ protected function max($param)
         }
 
         if ($this->isFile()) {
-        	return [];
+            return [];
         }
 
         return ['maxlength' => $max];
@@ -333,7 +333,7 @@ protected function between($param)
         }
 
         if ($this->isFile()) {
-        	return [];
+            return [];
         }
 
         return [