Cleaned up formattibng a bit