Minor changes, mostly aesthetic