Code cleanup to remove douplacte var definition
Code cleanup to remove douplacte var definition

Also move the declaration outside the loop since they accumulate state with each iteration

aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,graydon/rust,graydon/rust,aidancully/rust,aidancully/rust,aidancully/rust,aidancully/rust,graydon/rust,graydon/rust