[Code Style] Clean up plugins

Codestyle fixes for plugins

Cleanup PR
Some more cleanup
Restore the file
Merge pull request #4516 from roland-d/plugins_cs

[Code Style] Plugins