Refactored Node.h