Refactor: Remove need to pass indexPath through