replacing Node and Leaf with a simple List type
import cleanup