Refactoring topics.
Refactoring topics.