Remove special casing for first root node
Add else code for root tokens
Fix first line newline with if/else code