Cleanup and flesh out the plugin log macro