Refactors Vehicles library