Simplify the vehicles microservice with a cleanup
Refactor to split logic into methods