Get rid of the DummyNode
Formatting