* Apease Clippy and some renames

* Last clippy warning

* fmt

Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>