Code cleanup and Cargo version bump