Refactoring Plugins and Actions
More Cleanup