Topic/refactor comment migrator