Some cosmetic updates