refactoring rental car