Some minor refactoring
Minor fixes. Added a new helper class for broadcasts and notifications
Minor refactoring
Added some comments