Small refactoring on NodeQueue, and no more white space