Const rework