Cleaned up formating