Refactored magic numbers