fix import error in RentalBuilder;
optimize imports in ReportService