Constant-refactor