Minor Rust Cleanup etc. (5.00 - 10.00)