Style and formatting update