Some cleanup and rust 0.6