Modernize ormatting