Moving to 'cl-lib

Replacing 'cl functions with 'cl-lib functions.