improve code

improve codes
cc

cc