12 Commits (clippy-fix)