Some CC code improvement