* chore: improve commit messages * indent * cleanup * additional changes --------- Co-authored-by: Tim Möhlmann <[email protected]>