Clean up the output around commandline tools