Refactor: add makeEventListeners