The format that's super!

[skip ci] Fix Clippy and formatting master


+127 -193
16 changed files