various formatting improvements