Removed unnecessary c wrapping stuff and renamed a couple of functions for convenience
Removed unnecessary header file