More cleanup, and pretty listings

use `---`, that'll look closer to what user are actually seeing