bigger clippy refactors

Created by  danieleades  on November 30, 2020
KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC
Change contents