Constant refactor