removed a lot of console.log