use a bit more modern Rust idioms