Various minor cleanups; prettifying output