More cleaning up and added the topic Feed function