Uniformize coding style