Cleaned up rust_client slightly