Uniformize code