diff --git a/.jscsrc b/.jscsrc
index 4ff9c3ffb..bd50f5480 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,5 +1,8 @@
 {
-    "requireCurlyBraces": [ "if", "else", "for", "while", "do" ],
+    "requireCurlyBraces": {
+        "keywords": [ "if", "else", "for", "while", "do" ],
+        "allExcept" : ["return" , "continue", "break"]
+    },
     "requireSpaceAfterKeywords": [ "if", "else", "for", "while", "do", "switch", "return" ],
     "requireSpacesInFunctionExpression": {
         "beforeOpeningCurlyBrace": true
diff --git a/.jshintrc b/.jshintrc
index 5365325f3..24dfc91f0 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -7,7 +7,7 @@
     // Enforcing
     "bitwise"       : true,     // true: Prohibit bitwise operators (&, |, ^, etc.)
     "camelcase"     : false,    // true: Identifiers must be in camelCase
-    "curly"         : true,     // true: Require {} for every new block or scope
+    "curly"         : false,     // true: Require {} for every new block or scope
     "eqeqeq"        : true,     // true: Require triple equals (===) for comparison
     "forin"         : true,     // true: Require filtering for..in loops with obj.hasOwnProperty()
     "freeze"        : true,     // true: prohibits overwriting prototypes of native objects such as Array, Date etc.