Prefer C++ functions over C functions
Cleanups