Update to latest Rust
Fix formatting