7 Commits (clippy-fix)