Fixing magic numbers