Address PR comments
- remove some doc and code comments
- use `null`-conditional member access to make new test more clear