formatting improvements