Refactor/comment Block
Refactor event emitter