Removing magic numbers for explicit IPs