Better documentation, simpler header files