Regenerated plugins

Commits:
 * Code tidy up.