Includes a C++ (silly) function and some more cleaning