Clean Up Code around List Nodes