Moving more things into header files (maybe this can be an header-only library one day), formatting
Moving stuff to headers...