reformat some code
reformat some code
reuse existing types/names in module for cfunc wrapping instead of redeclaring them in the utility code