same refactoring. Constants