some formatting improvements