Cleaned up IPv4 some more