CitInfNoTopics: Cleanup initialization
CitInf: Make initialization more efficient

I must have been on crack when I wrote this code the first time