More work with Clippy