Refactor getCoreToDo slightly