Simplify CTCP code