Added Cargo lockfile
Minor refactoring