Some cosmetic changes to terminal output