fix usage of 'cl (require 'cl-lib and use cl-prefix)