linting and isNaN fix
isNaN fix