Modernization and formatting.