Refactor the plugin check logging mech