[UP] Code Improve. (2 Of 4)