some commenting cleanup in Topic

https://app.asana.com/0/19128794071969/19599640169227