Uniformize coding style between my two modifications