More lisp stuff
More cleanup