Changed some vars to consts (let)