Replace statics with consts