Cleaned up some formatting issues