Minor cleanup in topic
Merge pull request #1629 from pveentjer/cleanup/topic

Minor cleanup in topic