015.06 formatting cleanup