more cleanup of the lispy code