remove commented out code & use module.exports