LISP CP cleanup and refactoring