Refine the code according to the changes in other branches.