diff --git a/src/services/XmlFormatter.ts b/src/services/XmlFormatter.ts
index 6f4e314..e1fe224 100644
--- a/src/services/XmlFormatter.ts
+++ b/src/services/XmlFormatter.ts
@@ -36,7 +36,7 @@ export class XmlFormatter {
         }
         
         let parts: string[] = xml.split('~::~');
-            
+            console.log(parts);
         let inComment: boolean = false;
         let level: number = 0;
         let output: string = '';
@@ -61,7 +61,7 @@ export class XmlFormatter {
             
             // <elm></elm>
             else if (/^<(\w|:)/.test(parts[i - 1]) && /^<\/(\w|:)/.test(parts[i])
-                && /^<[\w:\-\.\,\/ ]+/.exec(parts[i - 1])[0] == /^<\/[\w:\-\.\, ]+/.exec(parts[i])[0].replace('/', '')) {
+                && /^<[\w:\-\.\,\/]+/.exec(parts[i - 1])[0] == /^<\/[\w:\-\.\,]+/.exec(parts[i])[0].replace('/', '')) {
 
                 output += parts[i];
                 if (!inComment) level--;
@@ -98,7 +98,7 @@ export class XmlFormatter {
             }
             
             // xmlns
-            else if (parts[i].search(/xmlns\:/) > -1 || parts[i].search(/xmlns\=/) > -1) {
+            else if (this.splitNamespaces && (parts[i].search(/xmlns\:/) > -1 || parts[i].search(/xmlns\=/) > -1)) {
                 output += this._getIndent(level, parts[i]);
             }