diff --git a/.editorconfig b/.editorconfig
index 70778bf..47ae637 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,24 +1,17 @@
-# For more information about the properties used in
-# this file, please see the EditorConfig documentation:
-# http://editorconfig.org/
+# For more information about the properties used in this file,
+# please see the EditorConfig documentation:
+# http://editorconfig.org
 
 [*]
 charset = utf-8
 end_of_line = lf
 indent_size = 4
-indent_style = tab
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.md]
-trim_trailing_whitespace = false
-
-[*.yml]
+[{*.yml,package.json}]
 indent_size = 2
-indent_style = space
 
-[{.travis.yml,package.json}]
-# The indent size used in the `package.json` file cannot be changed
+# The indent size used in the package.json file cannot be changed:
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516
-indent_size = 2
-indent_style = space