More refactoring in getCoreToDo