Use better const syntax