Codestyle in Plugins; Closes #3646