Code

rationalize function names and remove spurious soft_ptr