- Remove unused member from Node class
- Fix closure issue
- Simplify code