Refactored TodoCommentExtraction