diff --git a/addr.go b/addr.go
index 3a95626..9c0f685 100644
--- a/addr.go
+++ b/addr.go
@@ -42,7 +42,7 @@ func parseAddr(addr net.Addr) (ATYP byte, ADDR string, PORT uint16, err error) {
 }
 
 func buildTCPAddr(ATYP byte, ADDR string, PORT uint16) net.Addr {
-	connAddr := newAddr("tcp", fmt.Sprintf("%s:%d", ADDR, PORT))
+	connAddr := newAddr("udp", net.JoinHostPort(ADDR, fmt.Sprintf("%d", PORT)))
 	if ATYP == REQUEST_ATYP_IPV6 {
 		connAddr.network = "tcp6"
 	} else if ATYP == REQUEST_ATYP_IPV4 {
@@ -52,7 +52,7 @@ func buildTCPAddr(ATYP byte, ADDR string, PORT uint16) net.Addr {
 }
 
 func buildUDPAddr(ATYP byte, ADDR string, PORT uint16) net.Addr {
-	connAddr := newAddr("udp", fmt.Sprintf("%s:%d", ADDR, PORT))
+	connAddr := newAddr("udp", net.JoinHostPort(ADDR, fmt.Sprintf("%d", PORT)))
 	if ATYP == REQUEST_ATYP_IPV6 {
 		connAddr.network = "udp6"
 	} else if ATYP == REQUEST_ATYP_IPV4 {
diff --git a/logging.go b/logging.go
index 1e538d6..72613bd 100644
--- a/logging.go
+++ b/logging.go
@@ -19,37 +19,36 @@ type Logger interface {
 }
 
 // noLogger is a no-op logger
-type noLogger struct {
-}
+type noLogger struct{}
 
-func (l *noLogger) Debug(_ ...any) {
+func (*noLogger) Debug(_ ...any) {
 }
 
-func (l *noLogger) Debugf(_ string, _ ...any) {
+func (*noLogger) Debugf(_ string, _ ...any) {
 }
 
-func (l *noLogger) Info(_ ...any) {
+func (*noLogger) Info(_ ...any) {
 }
 
-func (l *noLogger) Infof(_ string, _ ...any) {
+func (*noLogger) Infof(_ string, _ ...any) {
 }
 
-func (l *noLogger) Warn(_ ...any) {
+func (*noLogger) Warn(_ ...any) {
 }
 
-func (l *noLogger) Warnf(_ string, _ ...any) {
+func (*noLogger) Warnf(_ string, _ ...any) {
 }
 
-func (l *noLogger) Error(_ ...any) {
+func (*noLogger) Error(_ ...any) {
 }
 
-func (l *noLogger) Errorf(_ string, _ ...any) {
+func (*noLogger) Errorf(_ string, _ ...any) {
 }
 
-func (l *noLogger) Fatal(_ ...any) {
+func (*noLogger) Fatal(_ ...any) {
 }
 
-func (l *noLogger) Fatalf(_ string, _ ...any) {
+func (*noLogger) Fatalf(_ string, _ ...any) {
 }
 
 // type guard
diff --git a/server.go b/server.go
index 6a87e8d..2280de3 100644
--- a/server.go
+++ b/server.go
@@ -99,7 +99,7 @@ func (s *Server) serverloop() {
 }
 
 func (s *Server) handleConn(clientConn net.Conn) error {
-	defer clientConn.Close()
+	defer clientConn.Close() // skipcq: GO-S2307
 
 	// Authenticate
 	err := s.auth.Auth(clientConn)
@@ -140,7 +140,7 @@ func (s *Server) handleCmdConnect(req *PacketRequest, clientConn net.Conn) error
 		return fmt.Errorf("failed to connect to %s:%d, (*socks5.Proxy).Connect: %w", req.DSTADDR, req.DSTPORT, err)
 	}
 
-	defer serverConn.Close()
+	defer serverConn.Close() // skipcq: GO-S2307
 
 	// Respond with bndAddr
 	err = replyAddr(serverConn.LocalAddr(), clientConn)
@@ -160,7 +160,7 @@ func (s *Server) handleCmdBind(req *PacketRequest, clientConn net.Conn) error {
 		replyError(err, clientConn)
 		return fmt.Errorf("failed to bind to %s:%d, (*socks5.Proxy).Bind: %v", req.DSTADDR, req.DSTPORT, err)
 	}
-	defer bindListener.Close() // MUST close the listener if the function returns with an error.
+	defer bindListener.Close() // MUST close the listener if the function returns with an error. // skipcq: GO-S2307
 
 	// Read first bndAddr, which is the address the proxy server is listening on
 	bndAddr := bindListener.Addr()
@@ -324,13 +324,11 @@ func (s *Server) handleCmdUDPAssociate(req *PacketRequest, clientConn net.Conn)
 		if err != nil {
 			return fmt.Errorf("failed to request packet, (*socks5.UDPAssociate).Request: %v", err)
 		}
-	} else {
-		if isSameAddr(clientUDPAddr, p.ClientAddr) {
-			// Send the request to the proxy
-			err = ur.request(p)
-			if err != nil {
-				return fmt.Errorf("failed to request packet, (*socks5.UDPAssociate).Request: %v", err)
-			}
+	} else if isSameAddr(clientUDPAddr, p.ClientAddr) {
+		// Send the request to the proxy
+		err = ur.request(p)
+		if err != nil {
+			return fmt.Errorf("failed to request packet, (*socks5.UDPAssociate).Request: %v", err)
 		}
 	}
 
@@ -490,7 +488,7 @@ func (ur *udpReassembler) request(req *PacketUDPRequest) error {
 	}
 }
 
-func (ur *udpReassembler) udpReassembleTimeout() time.Duration {
+func (ur *udpReassembler) udpReassembleTimeout() time.Duration { // skipcq: RVV-B0013
 	return 5 * time.Second // TODO: allow override
 }