Some cosmetic changes here and there.