Use more idiomatic let bindings