Clean up some stuff

Fixed a couple strings that were ductaped together. Squeezed everything
into a terminal width. Still needs work.