More code refine.