refactored topics