mpetrovich Improve formatting for visibility