lots of code changes after some clippy::pedantic

2 jobs for master in 10 minutes and 7 seconds
Status Job ID Name Coverage
  Deploy
passed #385962232
pages

00:10:07

passed pages:deploy

00:00:02