minor plugins refactor