Refectored the fetchedResultsController into a separate class