Remove the hard-coded config.
Fix up the output to be .. saner.