Move event listeners adding to better place