cl-num calculation cleanup