replace old cl with modern cl-lib