Formatting consistency fixes