Hernan.returning topic mapping

Cleanup + a function to retrieve the available topics/partitions.