Improve some formatting