Fix Some Formatting