Constant refactoring