Fixed formatting to support 80 column displays