Code refine

Code refine