Refactor internals to be consistent across plugins
CPAN Release 0.25

- Refactor internals to be consistent across plugins