Refactoring code, removing no longer to be used Node Type's and indenting json.