Better identification of the remaining TODO items