Comment formatting
Add option to use LocalBroadcastManager