Mostly aesthetic changes