Refactoring Node classes