Refactoring a couple of plugins
Refactoring a couple of plugins