add makeFetchedResultsController method and cleanup