Fixed up some formatting issues