updated modularization
removed console.log