Minor cleanup + EventEmitter2 lib binding