diff --git a/json.h b/json.h
index 295ba0b..e8e1a50 100644
--- a/json.h
+++ b/json.h
@@ -292,14 +292,14 @@ static char json_go_struct[256] = {
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_LOOP,    JSON_STATE_FAILED,  JSON_STATE_QUP, JSON_STATE_FAILED,
+    JSON_STATE_LOOP,    JSON_STATE_FAILED,  JSON_STATE_QUP,     JSON_STATE_FAILED,
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
     JSON_STATE_LOOP,    JSON_STATE_BARE,    JSON_STATE_FAILED,  JSON_STATE_FAILED,
     JSON_STATE_BARE,    JSON_STATE_BARE,    JSON_STATE_BARE,    JSON_STATE_BARE,
     JSON_STATE_BARE,    JSON_STATE_BARE,    JSON_STATE_BARE,    JSON_STATE_BARE,
-    JSON_STATE_BARE,    JSON_STATE_BARE,    JSON_STATE_SEP, JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_SEP, JSON_STATE_FAILED,  JSON_STATE_FAILED,
+    JSON_STATE_BARE,    JSON_STATE_BARE,    JSON_STATE_SEP,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,  JSON_STATE_SEP,     JSON_STATE_FAILED,  JSON_STATE_FAILED,
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
@@ -437,7 +437,7 @@ static char json_go_string[256] = {
     JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,
     JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,
     JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,
-    JSON_STATE_ESC, JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,
+    JSON_STATE_ESC,     JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,
     JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,
     JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,
     JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,    JSON_STATE_LOOP,
@@ -544,70 +544,70 @@ static char json_go_esc[256] = {
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
     JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,};
 static char json_go_utf8[256] = {
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,   JSON_STATE_UTF8_NEXT,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,
-    JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,  JSON_STATE_FAILED,};
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,  JSON_STATE_UTF8_NEXT,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,
+    JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,     JSON_STATE_FAILED,};
 static char json_go_num[256] = {
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
@@ -620,13 +620,13 @@ static char json_go_num[256] = {
     JSON_STATE_NUM_BREAK,   JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_LOOP,
-    JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_FLT, JSON_STATE_NUM_FAILED,
+    JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_FLT,     JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_LOOP,
     JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_LOOP,
     JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_LOOP,    JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
-    JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_EXP, JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
+    JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_EXP,     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
@@ -634,7 +634,7 @@ static char json_go_num[256] = {
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
-    JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_EXP, JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
+    JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_EXP,     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
     JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,  JSON_STATE_NUM_FAILED,
@@ -729,7 +729,7 @@ json_stoi(int *neg, struct json_token *tok)
     *neg = (tok->str[0] == '-') ? 1 : 0;
     for (i = off; i < tok->len; i++) {
         if ((tok->str[i] >= '0') && (tok->str[i] <= '9'))
-            n = (n * 10) + tok->str[i]  - '0';
+            n = (n * 10) + tok->str[i] - '0';
     } return (*neg) ? -n : n;
 }
 JSON_INTERN json_number
@@ -756,7 +756,7 @@ json_lcmp(const struct json_token* tok, const char* str, int len)
     JSON_ASSERT(str);
     if (!tok || !str || !len) return 1;
     if (tok->len != len) return 1;
-    for (i = 0; (i < tok->len && i < len); i++, str++){
+    for (i = 0; i < tok->len && i < len; i++, str++) {
         if (tok->str[i] != *str)
             return 1;
     } return 0;
@@ -786,7 +786,7 @@ json_convert(json_number *num, const struct json_token *tok)
     write->str = tok->str;
 
     for (cur = tok->str; len; cur++, len--) {
-        char state =  json_go_num[*(const unsigned char*)cur];
+        char state = json_go_num[*(const unsigned char*)cur];
         switch (state) {
             case JSON_STATE_NUM_FAILED:
                 return JSON_NONE;
@@ -839,10 +839,10 @@ json_cmp(const struct json_token* tok, const char* str)
     JSON_ASSERT(tok);
     JSON_ASSERT(str);
     if (!tok || !str) return 1;
-    for (i = 0; (i < tok->len); i++, str++){
+    for (i = 0; i < tok->len; i++, str++) {
         if (tok->str[i] != *str)
             return 1;
-    } return *str == '\0' ? 0 : 1;
+    } return (*str == '\0') ? 0 : 1;
 }
 /*--------------------------------------------------------------------------
                                 TOKENIZER
@@ -866,7 +866,7 @@ json_read(struct json_token *obj, const struct json_iter* prev)
     JSON_ASSERT(obj);
     JSON_ASSERT(prev);
     if (!prev || !obj || !prev->src || !prev->len || prev->err) {
-        /* case either invalid iterator or eof  */
+        /* case either invalid iterator or eof */
         struct json_iter it = JSON_ITER_NULL;
         *obj = JSON_TOKEN_NULL;
         it.err = 1;
@@ -984,7 +984,7 @@ json_read(struct json_token *obj, const struct json_iter* prev)
     if (!iter.depth) {
         iter.src = 0, iter.len = 0;
         if (obj->str) { /* reached eof */
-            obj->len = (c == '}') ? (int)((cur-1) - obj->str): (int)(cur - obj->str);
+            obj->len = (c == '}') ? (int)((cur-1) - obj->str) : (int)(cur - obj->str);
             obj->type = (enum json_token_type)json_type(obj);
             if (obj->type == JSON_STRING)
                 json_deq(obj);
@@ -1108,7 +1108,7 @@ json_load(struct json_parser *p, const char *str, int len)
 JSON_INTERN const char*
 json_strchr(const char *str, char c, int len)
 {
-    int neg = (len < 0) ? 1: 0;
+    int neg = (len < 0) ? 1 : 0;
     int dec = neg ? 0 : 1;
     len = neg ? 0 : len;
     if (!str) return NULL;
@@ -1155,7 +1155,7 @@ json_path_parse_name(struct json_token *tok, const char *path,
         return NULL;
     }
     tok->len = (int)(del - tok->str);
-    return del+1;
+    return del + 1;
 }
 JSON_INTERN int
 json_path_parse_array(struct json_token *array, const struct json_token *token)
@@ -1218,7 +1218,7 @@ json_query(struct json_token *toks, int count, const char *path)
                 /* array object so set iterator to array index */
                 if (!json_path_parse_array(&array, &name))
                     return NULL;
-                if ((i+1) > count)
+                if ((i + 1) > count)
                     return NULL;
                 if (array.len < 1)
                     return NULL;
@@ -1244,7 +1244,7 @@ json_query(struct json_token *toks, int count, const char *path)
             }
             continue;
         }
-        /* check if current table element is equal to the current path  */
+        /* check if current table element is equal to the current path */
         if (!json_lcmp(iter, name.str, name.len)) {
             /* correct token found and end of path */
             if (!path) {
@@ -1253,9 +1253,9 @@ json_query(struct json_token *toks, int count, const char *path)
                 return (iter + 1);
             }
             /* check if path points to invalid token */
-            if ((i+1) > count)
+            if ((i + 1) > count)
                 return NULL;
-            if(toks[i+1].type != JSON_OBJECT && toks[i+1].type != JSON_ARRAY)
+            if (toks[i+1].type != JSON_OBJECT && toks[i+1].type != JSON_ARRAY)
                 return NULL;
 
             /* look deeper into child object/array */