edited comments and removed console.logs