Extractor method refactor