Minor changes to output. Code cleanup.