improve some more formatting