Clean up some formatting