Cosmetic changes, added listener and broadcaster