Some cosmetic updates :-)