Cosmetics

Some cosmetic changes, particularly converting spaces to tabs.