Code reformat and minor updates only.