Removing protected declaration from the static module methods in the plugin module and reordering a few methods.