more formatting fixes