Fix up formating