C-wrapper reformated and added some statics