some more formatting improvements