Switch to DefaultNodeStore for evaluation purposes

Remove Node field for unbiased memory evaluation
Improve code style (conditional expressions)
Comment unused blocks
Remove unused constructor and method parameters

Improves code style