decorates the ast with the locations
Some cleanup
Some cleanup