fix comments with ipv6 (and refactoring)