Refactored table view method to match new CoreData setup