CMTC-87: Added the node type and reformated the code