Refactor Topic