Some cosmetic modifications