FIx comment

- “is not None” is not necessary
- rename variable for clearly