made the plugin a bit more readable