Code review changes, add some comments and kill un-needed rebroadcast