Minor refinements

Enhance readability of output