STBoyden Implement clippy suggestions