Clean up some formatting concerns