Also address Clippy warnings
Co-authored-by: Gregório Granado Magalhães <greg.magalhaes@gmail.com>
Co-authored-by: K <kelseydrhoda@gmail.com>