Clean up
Fix formatting on non-ANSI terminals
Typo