Updated to Rust master
Cleaned up