code cleaning c1 -> c