For future PRs and refactoring, let's remove all calls to `extract()` those make the methods harder to read imo