[minor] Using eventemitter3 and some tweaks