more formatting improvements