[Code Style] Clean up plugins

Codestyle fixes for plugins

Cleanup PR