IPv6 compatibility & cleaning up