some code cleanup for renewal reports