RentalService added, code reformat