Minor extractor refactoring