Dvds and rentals refactoring