refactored car service