Refactored 'magic numbers'