Review and refactored code.Also eliminated data table for node properties