Formatting fixes FTW