Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Aaronepower <3dd3bfa690f82720aee242f99fa9a82698699bec@users.noreply.github.com>
aidancully/rust,graydon/rust,graydon/rust,graydon/rust,aidancully/rust,aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,aidancully/rust