Formatting fixes again