Code cleanup/rewording of plugins.