some code cleanup for serializer and renewal_reports