minor refactorings
changed vehicle -- service-provider architecture