Idiomatic Rust, improve code quality

[wouterdebie]

I'm pretty new to coding in Rust and there are probably places where the code could be more idiomatic and in general better.