Minor refactoring and additional WP plugin