refactored constants
refactored constants