More cleanup, and pretty listings