Address further clippy lints