more formatting cleanup