diff --git a/JsonGenerator/IndentedPrintDecorator.cpp b/JsonGenerator/IndentedPrintDecorator.cpp
index d8680121..7d30e0ca 100644
--- a/JsonGenerator/IndentedPrintDecorator.cpp
+++ b/JsonGenerator/IndentedPrintDecorator.cpp
@@ -2,12 +2,14 @@
 
 void IndentedPrintDecorator::indent()
 {
-    currentTabCount++;
+    if (level<127)
+        level++;
 }
 
 void IndentedPrintDecorator::unindent()
 {
-    currentTabCount--;
+    if (level>0)
+        level--;
 }
 
 size_t IndentedPrintDecorator::write(uint8_t c)
@@ -15,7 +17,7 @@ size_t IndentedPrintDecorator::write(uint8_t c)
     size_t n = 0;
 
     if (isNewLine)
-        n += writeCurrentTabs();
+        n += writeTabs();
 
     n += sink.write(c);
 
@@ -24,16 +26,11 @@ size_t IndentedPrintDecorator::write(uint8_t c)
     return n;
 }
 
-size_t IndentedPrintDecorator::writeCurrentTabs()
-{
-    return writeTabs(currentTabCount);
-}
-
-size_t IndentedPrintDecorator::writeTabs(int count)
+size_t IndentedPrintDecorator::writeTabs()
 {
     size_t n = 0;
 
-    for (int i = 0; i<count; i++)
+    for (int i = 0; i<level; i++)
         n += sink.write(' ');
 
     return n;
diff --git a/JsonGenerator/IndentedPrintDecorator.h b/JsonGenerator/IndentedPrintDecorator.h
index 1e5e9e2d..98000b25 100644
--- a/JsonGenerator/IndentedPrintDecorator.h
+++ b/JsonGenerator/IndentedPrintDecorator.h
@@ -14,23 +14,20 @@ public:
     IndentedPrintDecorator(Print& p)
         : sink(p)
     {
-        pendingTabCount = 0;
-        currentTabCount = 0;
+        level = 0;
         isNewLine = true;
     }
 
+    virtual size_t write(uint8_t);
+
     void indent();
     void unindent();
 
-    bool isNewLine;
-    virtual size_t write(uint8_t);
-
 private:
     Print& sink;
-    int currentTabCount;
-    int pendingTabCount;
+    uint8_t level : 7;
+    bool isNewLine : 1;
 
-    size_t writeCurrentTabs();
-    size_t writeTabs(int count);
+    size_t writeTabs();
 };