Some cosmetic improvements