Made the plugin more readable