even more formatting fixes