improve some formatting