refactor option + continue plugin refactoring