removed most console.log()