Refactors TopicCreator
Merge pull request #1914 from velesin/topic_creator_refactoring

Refactors TopicCreator