refactor extraction strategy and method names