Clang-format and very minor changes
Forgot to add review ease & time! Also, CSV bugfix