Expand if else methods in CatCont to be more readable