Modernize code formatting