Topic refactoring