and more formatting improvements