Code reformat #2.