release-21.6
Fixes minor code issues
Follow up fixes after code restructure (#341)
Format everything using clang-format (#267)
Various small improvements and fixes