Get rid of dataEndListener
Restructure module.exports