Minor changes. Mostly aesthetic.