fixed return and removed bad console.logs