Modernize coding style