Fix topic handling
Cleanup class names.