Tidy
Little tidy. Now going to subsume leaf into sort
subsumed leaf into sortstate