More idiomatic Rust