Formatting and style updates