Clean up some formatting stuff