Formatting fixes in Main