Cleaning up some formatting