fixed LN18 and removed console.logs