Formatting cleanup & fixes