Refactored constants