Better docs, formatting of output, and cleanup