refactor topic