Refactor Node Properties