Moving to cl-lib and changing function calls accordingly