diff --git a/src/fenrir-package/core/punctuationManager.py b/src/fenrir-package/core/punctuationManager.py
index 71c1d26f..e33bf6d0 100644
--- a/src/fenrir-package/core/punctuationManager.py
+++ b/src/fenrir-package/core/punctuationManager.py
@@ -14,11 +14,11 @@ class punctuationManager():
         self.env = environment
         self.allPunctNone = dict.fromkeys(map(ord, string.punctuation), None)
         self.punctuation = {
-        'currLevel':'3',
+        'currLevel':'Some',
         'levels':{
-          '1':',',
-          '2':'.',
-          '3':'.,:-$~+*-/\\@;',
+          'None': '',
+          'Some': '.,:-$~+*-/\\@;',
+          'All': string.punctuation,
           },
         'punctuationDict':{
           '&':'and',
@@ -79,7 +79,6 @@ class punctuationManager():
             for key,item in punctuationDict.items():
                 if key in punctuation:
                     resultText = resultText.replace(str(key),' ' +str(item) +' ')
-
         return resultText
     
     def proceedPunctuation(self, text, ignorePunctuation=False):