Some esthetic code improvements.