lines 155 - 160 formatting cleanup