Minor cleanup in topic