large improvements to readability of both output and source code