Some cosmetic changes to improve the look.