Use make leaf instead of add

Using add was an easy way to reuse some code, but its more clear
to use make leaf, since that is what we want to accomplish