Refactoring to Rust