Removed option to send extra params to notify/listen;
Made code more human readable